summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/x86/alix2/config-default4
-rw-r--r--target/linux/x86/config-3.25
-rw-r--r--target/linux/x86/config-default8
-rw-r--r--target/linux/x86/generic/config-default6
-rw-r--r--target/linux/x86/geos/config-default4
5 files changed, 17 insertions, 10 deletions
diff --git a/target/linux/x86/alix2/config-default b/target/linux/x86/alix2/config-default
index def5482ad..7d4f8d82f 100644
--- a/target/linux/x86/alix2/config-default
+++ b/target/linux/x86/alix2/config-default
@@ -15,6 +15,10 @@ 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 fa131aa0a..75503f8a2 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
diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index 5dd172bfd..9b7b61446 100644
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -246,10 +246,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
diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index 252e93818..0b8ae2263 100644
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -52,9 +52,13 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
+CONFIG_PATA_AMD=y
CONFIG_PATA_LEGACY=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_PLATFORM=y
-CONFIG_PATA_AMD=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_VIA=y
CONFIG_PCIEAER=y
CONFIG_PCIEPORTBUS=y
CONFIG_VT=y
diff --git a/target/linux/x86/geos/config-default b/target/linux/x86/geos/config-default
index ee9f24dc5..6d4fe037c 100644
--- a/target/linux/x86/geos/config-default
+++ b/target/linux/x86/geos/config-default
@@ -5,6 +5,7 @@ CONFIG_DMIID=y
# CONFIG_DMI_SYSFS is not set
# CONFIG_FB_GEODE is not set
CONFIG_GENERIC_GPIO=y
+CONFIG_GEOS=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HIGHMEM64G is not set
@@ -15,7 +16,8 @@ CONFIG_HWMON=y
# CONFIG_M486 is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MGEODE_LX=y
-CONFIG_GEOS=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_PCSPKR_PLATFORM=y
CONFIG_PATA_CS5536=y
# CONFIG_POWER_SUPPLY is not set
# CONFIG_SCx200 is not set