aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/config-3.2
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-02-03 18:02:57 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-02-03 18:02:57 +0000
commitab2e45e1bad9aa6b1aef153717cf09b0fefe2371 (patch)
treea4fa06ca9a9ae231b950b87a1db9876d67f08fc9 /target/linux/x86/config-3.2
parent123f3c24aa3bfd147a412d7c582a3ca1a6895698 (diff)
downloadupstream-ab2e45e1bad9aa6b1aef153717cf09b0fefe2371.tar.gz
upstream-ab2e45e1bad9aa6b1aef153717cf09b0fefe2371.tar.bz2
upstream-ab2e45e1bad9aa6b1aef153717cf09b0fefe2371.zip
[PATCH 1/1] x86: move additional oddball PATA drivers
These should only be enabled in the generic image, as they bloat all of the other targets. Also add symbols for NET5501, ALIX, and GEOS which were added backported to 3.2 and 3.3. Restore PC speaker to Geos target. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30019 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/config-3.2')
-rw-r--r--target/linux/x86/config-3.25
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/x86/config-3.2 b/target/linux/x86/config-3.2
index fa131aa0ad..75503f8a20 100644
--- a/target/linux/x86/config-3.2
+++ b/target/linux/x86/config-3.2
@@ -237,6 +237,7 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_KM=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_NET5501 is not set
# CONFIG_NET_NS is not set
CONFIG_NOHIGHMEM=y
CONFIG_NO_BOOTMEM=y
@@ -249,10 +250,6 @@ 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_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCI=y