diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-05-30 14:53:52 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-05-30 14:53:52 +1000 |
| commit | 17d55a1acd9391a3c4f4abf2803289ef801445bd (patch) | |
| tree | 985c556bfb2e35d75737d9620b6e789cc35f6282 | |
| parent | 7c19cb06a61500f9aab21e9e95173d0305bff25c (diff) | |
| download | meta-xilinx-17d55a1acd9391a3c4f4abf2803289ef801445bd.tar.gz | |
common/linux/*.cfg: Fix up new line at end of file
* The new line at the end of the file is needed for cfg fragments in
order for the kernel merge scripts to work correctly
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
5 files changed, 7 insertions, 2 deletions
diff --git a/conf/machine/boards/common/linux/microblaze/defconfig_3.10.cfg b/conf/machine/boards/common/linux/microblaze/defconfig_3.10.cfg index f269d9fd..f865e736 100644 --- a/conf/machine/boards/common/linux/microblaze/defconfig_3.10.cfg +++ b/conf/machine/boards/common/linux/microblaze/defconfig_3.10.cfg | |||
| @@ -1167,3 +1167,4 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y | |||
| 1167 | # CONFIG_AVERAGE is not set | 1167 | # CONFIG_AVERAGE is not set |
| 1168 | # CONFIG_CORDIC is not set | 1168 | # CONFIG_CORDIC is not set |
| 1169 | # CONFIG_DDR is not set | 1169 | # CONFIG_DDR is not set |
| 1170 | |||
diff --git a/conf/machine/boards/common/linux/microblaze/defconfig_3.14.cfg b/conf/machine/boards/common/linux/microblaze/defconfig_3.14.cfg index b8e1eae0..534a6149 100644 --- a/conf/machine/boards/common/linux/microblaze/defconfig_3.14.cfg +++ b/conf/machine/boards/common/linux/microblaze/defconfig_3.14.cfg | |||
| @@ -1167,3 +1167,4 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y | |||
| 1167 | # CONFIG_AVERAGE is not set | 1167 | # CONFIG_AVERAGE is not set |
| 1168 | # CONFIG_CORDIC is not set | 1168 | # CONFIG_CORDIC is not set |
| 1169 | # CONFIG_DDR is not set | 1169 | # CONFIG_DDR is not set |
| 1170 | |||
diff --git a/conf/machine/boards/common/linux/rtc.cfg b/conf/machine/boards/common/linux/rtc.cfg index ac838f1d..3037a8aa 100644 --- a/conf/machine/boards/common/linux/rtc.cfg +++ b/conf/machine/boards/common/linux/rtc.cfg | |||
| @@ -12,4 +12,5 @@ CONFIG_RTC_INTF_SYSFS=y | |||
| 12 | CONFIG_RTC_INTF_PROC=y | 12 | CONFIG_RTC_INTF_PROC=y |
| 13 | CONFIG_RTC_INTF_DEV=y | 13 | CONFIG_RTC_INTF_DEV=y |
| 14 | 14 | ||
| 15 | CONFIG_RTC_DRV_PCF8563=y \ No newline at end of file | 15 | CONFIG_RTC_DRV_PCF8563=y |
| 16 | |||
diff --git a/conf/machine/boards/common/linux/zynq/defconfig_3.10.cfg b/conf/machine/boards/common/linux/zynq/defconfig_3.10.cfg index d057fc19..53cfc98b 100644 --- a/conf/machine/boards/common/linux/zynq/defconfig_3.10.cfg +++ b/conf/machine/boards/common/linux/zynq/defconfig_3.10.cfg | |||
| @@ -2785,3 +2785,4 @@ CONFIG_KVM_ARM_MAX_VCPUS=0 | |||
| 2785 | # | 2785 | # |
| 2786 | # Virtio drivers | 2786 | # Virtio drivers |
| 2787 | # | 2787 | # |
| 2788 | |||
diff --git a/conf/machine/boards/common/linux/zynq/defconfig_3.14.cfg b/conf/machine/boards/common/linux/zynq/defconfig_3.14.cfg index 269ffc8a..6978b7c9 100644 --- a/conf/machine/boards/common/linux/zynq/defconfig_3.14.cfg +++ b/conf/machine/boards/common/linux/zynq/defconfig_3.14.cfg | |||
| @@ -254,4 +254,5 @@ CONFIG_DEBUG_ZYNQ_UART1=y | |||
| 254 | CONFIG_EARLY_PRINTK=y | 254 | CONFIG_EARLY_PRINTK=y |
| 255 | CONFIG_FONTS=y | 255 | CONFIG_FONTS=y |
| 256 | CONFIG_FONT_8x8=y | 256 | CONFIG_FONT_8x8=y |
| 257 | CONFIG_FONT_8x16=y \ No newline at end of file | 257 | CONFIG_FONT_8x16=y |
| 258 | |||