diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2013-06-04 11:19:41 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2013-06-04 11:19:41 +0000 |
commit | 812bb43a4792d8ffe0f14bb45a6f832ad8acaf19 (patch) | |
tree | 05cd9bcf2e0ce5e91d9f241c037babf07ff69f1e | |
parent | 58fa46c90c4c590565b3ffc5fc6c6dfd1e3d2c8a (diff) | |
download | upstream-812bb43a4792d8ffe0f14bb45a6f832ad8acaf19.tar.gz upstream-812bb43a4792d8ffe0f14bb45a6f832ad8acaf19.tar.bz2 upstream-812bb43a4792d8ffe0f14bb45a6f832ad8acaf19.zip |
move DT2 related kernel options into the harddist subtarget
SVN-Revision: 36833
-rw-r--r-- | target/linux/orion/config-3.3 | 8 | ||||
-rw-r--r-- | target/linux/orion/harddisk/config-3.3 | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/target/linux/orion/config-3.3 b/target/linux/orion/config-3.3 index c85740a8e2..9418e0004f 100644 --- a/target/linux/orion/config-3.3 +++ b/target/linux/orion/config-3.3 @@ -84,8 +84,8 @@ CONFIG_HAVE_PROC_CPU=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_SCHED_CLOCK=y CONFIG_HAVE_SPARSE_IRQ=y -CONFIG_HWMON=y -CONFIG_I2C_BOARDINFO=y +# CONFIG_HWMON is not set +# CONFIG_I2C_BOARDINFO is not set CONFIG_INET_LRO=y CONFIG_INITRAMFS_SOURCE="" CONFIG_KTIME_SCALAR=y @@ -94,7 +94,7 @@ CONFIG_LEDS_GPIO=y # CONFIG_MACH_D2NET is not set # CONFIG_MACH_DB88F5281 is not set # CONFIG_MACH_DNS323 is not set -CONFIG_MACH_DT2=y +# CONFIG_MACH_DT2 is not set # CONFIG_MACH_EDMINI_V2 is not set # CONFIG_MACH_KUROBOX_PRO is not set # CONFIG_MACH_LINKSTATION_LSCHL is not set @@ -135,7 +135,7 @@ CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y CONFIG_PLAT_ORION=y # CONFIG_PREEMPT_RCU is not set -CONFIG_RTC_CLASS=y +# CONFIG_RTC_CLASS is not set # CONFIG_SCSI_DMA is not set CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/target/linux/orion/harddisk/config-3.3 b/target/linux/orion/harddisk/config-3.3 index a566aa537e..73bf55c11a 100644 --- a/target/linux/orion/harddisk/config-3.3 +++ b/target/linux/orion/harddisk/config-3.3 @@ -8,7 +8,10 @@ CONFIG_CRC16=y # CONFIG_DM_SNAPSHOT is not set CONFIG_EXT4_FS=y CONFIG_FS_MBCACHE=y +CONFIG_HWMON=y +CONFIG_I2C_BOARDINFO=y CONFIG_JBD2=y +CONFIG_MACH_DT2=y CONFIG_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_LINEAR=y @@ -18,6 +21,7 @@ CONFIG_MD_RAID1=y # CONFIG_MD_RAID10 is not set # CONFIG_MD_RAID456 is not set CONFIG_NLS=y +CONFIG_RTC_CLASS=y CONFIG_SATA_MV=y CONFIG_SCSI=y CONFIG_SCSI_MOD=y |