From 75849dd92dbde2e9bb1c1b1dd39f620bac88ad8c Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Fri, 30 May 2014 14:53:52 +1000 Subject: 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 --- conf/machine/boards/common/linux/microblaze/defconfig_3.10.cfg | 1 + conf/machine/boards/common/linux/microblaze/defconfig_3.14.cfg | 1 + conf/machine/boards/common/linux/rtc.cfg | 3 ++- conf/machine/boards/common/linux/zynq/defconfig_3.10.cfg | 1 + conf/machine/boards/common/linux/zynq/defconfig_3.14.cfg | 3 ++- 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 # CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set # CONFIG_DDR is not set + 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 # CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set # CONFIG_DDR is not set + 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 CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_DRV_PCF8563=y \ No newline at end of file +CONFIG_RTC_DRV_PCF8563=y + 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 # # Virtio drivers # + 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 CONFIG_EARLY_PRINTK=y CONFIG_FONTS=y CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y \ No newline at end of file +CONFIG_FONT_8x16=y + -- cgit v1.2.3-54-g00ecf