From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 25 Jan 2010 14:24:58 +0000 (+0000)
Subject: ar71xx: sync kernel configs
X-Git-Tag: reboot~21291
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aa196516d5d51cef19f4ccd5f8c68c028b14eb8f;p=openwrt%2Fstaging%2Fpepe2k.git

ar71xx: sync kernel configs

SVN-Revision: 19328
---

diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index 9cdfa01879..3b8529b222 100644
--- 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 002e4a9357..192daa65e4 100644
--- 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