unset user overrides for quilt settings to prevent them from interfering with the...

[openwrt.git] / target / linux / generic-2.6 / config-2.6.32

diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32
index bfd0435..d23d8ff 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.32
+++ b/target/linux/generic-2.6/config-2.6.32
@@ -1787,6 +1787,9 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8192E is not set
 # CONFIG_RTL8192SU is not set
 # CONFIG_RTL8306_PHY is not set
 # CONFIG_RTL8192E is not set
 # CONFIG_RTL8192SU is not set
 # CONFIG_RTL8306_PHY is not set

+# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
+# CONFIG_RTL8366_SMI is not set

 CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_S2IO is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_S2IO is not set


@@ -2488,6 +2491,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 # CONFIG_USB_SERIAL_PL2303 is not set
 # CONFIG_USB_SERIAL_QUALCOMM is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
 # CONFIG_USB_SERIAL_QUALCOMM is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set

+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set

 # CONFIG_USB_SERIAL_SAFE is not set
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SERIAL_SIEMENS_MPI is not set
 # CONFIG_USB_SERIAL_SAFE is not set
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SERIAL_SIEMENS_MPI is not set