ramips: sync 2.6.32 config

[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 e6c2653..df0dcfb 100644 (file)
--- a/target/linux/atheros/config-2.6.33
+++ b/target/linux/atheros/config-2.6.33
@@ -21,7 +21,6 @@ CONFIG_ATHEROS_WDT=y
 # CONFIG_BCM63XX is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BUG is not set
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -81,6 +80,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GPIO_DEVICE=y
+# CONFIG_HAMRADIO is not set
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -96,6 +96,7 @@ CONFIG_HAVE_IDE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
+CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
@@ -162,6 +163,7 @@ CONFIG_MVSWITCH_PHY=y
 # 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
 # CONFIG_PMC_MSP is not set