aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-02-03 19:47:55 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-02-03 19:47:55 +0000
commitc433bfb5711474b1c2c8c35220e22d601d3b0dc7 (patch)
tree5a6e420c696041f69b18f7a012297a10d5c391e5 /target/linux/x86
parent40867f1b681b23634cb617f158b265b1d8ad1181 (diff)
downloadupstream-c433bfb5711474b1c2c8c35220e22d601d3b0dc7.tar.gz
upstream-c433bfb5711474b1c2c8c35220e22d601d3b0dc7.tar.bz2
upstream-c433bfb5711474b1c2c8c35220e22d601d3b0dc7.zip
disable additional PATA drivers in global 3.2 and 3.3 config, remove redundant symbols from alix2 config
SVN-Revision: 30024
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/alix2/config-default4
-rw-r--r--target/linux/x86/config-3.24
-rw-r--r--target/linux/x86/config-3.310
3 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/x86/alix2/config-default b/target/linux/x86/alix2/config-default
index 7d4f8d82f3..def5482ad3 100644
--- a/target/linux/x86/alix2/config-default
+++ b/target/linux/x86/alix2/config-default
@@ -15,10 +15,6 @@ CONFIG_HWMON=y
# CONFIG_MATH_EMULATION is not set
CONFIG_MGEODE_LX=y
CONFIG_PATA_CS5536=y
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_VIA is not set
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_POWER_SUPPLY is not set
diff --git a/target/linux/x86/config-3.2 b/target/linux/x86/config-3.2
index 7317bf1651..4396762935 100644
--- a/target/linux/x86/config-3.2
+++ b/target/linux/x86/config-3.2
@@ -251,6 +251,10 @@ CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARAVIRT_GUEST is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_VIA is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCI=y
diff --git a/target/linux/x86/config-3.3 b/target/linux/x86/config-3.3
index 0fa935c8bd..8843ee19c1 100644
--- a/target/linux/x86/config-3.3
+++ b/target/linux/x86/config-3.3
@@ -105,6 +105,7 @@ CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_ISA_DMA=y
# CONFIG_GENERIC_TIME_VSYSCALL is not set
+# CONFIG_GEOS is not set
# CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_HANGCHECK_TIMER is not set
CONFIG_HAS_DMA=y
@@ -240,6 +241,7 @@ CONFIG_NEED_PER_CPU_KM=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_NEED_SG_DMA_LENGTH=y
# CONFIG_NET_NS is not set
+# CONFIG_NET5501 is not set
CONFIG_NOHIGHMEM=y
CONFIG_NO_BOOTMEM=y
CONFIG_NR_CPUS=1
@@ -251,10 +253,10 @@ CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARAVIRT_GUEST is not set
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_VIA=y
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_VIA is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCI=y