brcm47xx: refresh patches with kernel 2.6.37-rc7

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

diff --git a/target/linux/atheros/config-2.6.34 b/target/linux/atheros/config-2.6.34
index a2d02b5..e8c17ae 100644 (file)
--- a/target/linux/atheros/config-2.6.34
+++ b/target/linux/atheros/config-2.6.34
@@ -1,6 +1,5 @@
 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
@@ -21,12 +20,10 @@ CONFIG_ATHEROS_WDT=y
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM63XX is not set
 CONFIG_BITREVERSE=y
-# CONFIG_BRIDGE_IGMP_SNOOPING is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CEPH_FS is not set
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
@@ -63,17 +60,12 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-# CONFIG_CRYSTALHD is not set
 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_NONCOHERENT=y
-# CONFIG_DT3155 is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_FSNOTIFY is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -105,9 +97,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IP17XX_PHY=y
 CONFIG_IRQ_CPU=y
 # CONFIG_LEDS_GPIO is not set
-# CONFIG_LOGFS is not set
 CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_LPC_SCH is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -140,6 +130,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
@@ -154,7 +145,6 @@ CONFIG_SCSI_MOD=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-# CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set