brcm47xx: this patch went upstream

[openwrt.git] / target / linux / atheros / config-2.6.33

diff --git a/target/linux/atheros/config-2.6.33 b/target/linux/atheros/config-2.6.33
index 8c646bc..bccb414 100644 (file)
--- a/target/linux/atheros/config-2.6.33
+++ b/target/linux/atheros/config-2.6.33
@@ -1,6 +1,5 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set

-CONFIG_ADM6996_PHY=y

 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 CONFIG_AR231X_ETHERNET=y
 # CONFIG_AR7 is not set
 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 CONFIG_AR231X_ETHERNET=y
 # CONFIG_AR7 is not set


@@ -63,9 +62,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y

-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set

 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y


@@ -127,7 +123,6 @@ CONFIG_MTD_MYLOADER_PARTS=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
 CONFIG_MTD_REDBOOT_PARTS=y

-# CONFIG_MUTEX_SPIN_ON_OWNER is not set

 CONFIG_MVSWITCH_PHY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NO_IOPORT is not set
 CONFIG_MVSWITCH_PHY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NO_IOPORT is not set