ar71xx: sync kernel configs

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19328 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index 9cdfa01879ef0990ae88495d7eff25c921d69082..3b8529b22263bb3f4fa61b669ec915658bc96390 100644 (file)
--- a/target/linux/ar71xx/config-2.6.31
+++ b/target/linux/ar71xx/config-2.6.31
@@ -105,7 +105,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_NXP_74HC153 is not set
 CONFIG_GPIO_NXP_74HC153=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HARDWARE_WATCHPOINTS=y
@@ -188,9 +187,9 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_RTL8306_PHY=y
-CONFIG_RTL8366_SMI=y
 CONFIG_RTL8366S_PHY=y
 # CONFIG_RTL8366S_PHY_DEBUG_FS is not set
+CONFIG_RTL8366_SMI=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

diff --git a/target/linux/ar71xx/config-2.6.32 b/target/linux/ar71xx/config-2.6.32
index 002e4a93573d7c5c9ce3d08afc0c13008eee803e..192daa65e43d1a535021ecfc455446df1b4636a2 100644 (file)
--- a/target/linux/ar71xx/config-2.6.32
+++ b/target/linux/ar71xx/config-2.6.32
@@ -191,9 +191,9 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_RTL8306_PHY=y
-CONFIG_RTL8366_SMI=y
 CONFIG_RTL8366S_PHY=y
 # CONFIG_RTL8366S_PHY_DEBUG_FS is not set
+CONFIG_RTL8366_SMI=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set