aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-15 10:58:52 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-15 10:58:52 +0000
commitcb4c118e50404918b98033de7402ca68eb31e3e7 (patch)
tree2a02351f9fe7cbffdc9a31213eb36ffb36523ce2 /target/linux/x86
parentf47ed77684f8861826368d90948c9c23c62f7a7a (diff)
downloadupstream-cb4c118e50404918b98033de7402ca68eb31e3e7.tar.gz
upstream-cb4c118e50404918b98033de7402ca68eb31e3e7.tar.bz2
upstream-cb4c118e50404918b98033de7402ca68eb31e3e7.zip
linux: move certain disabled symbols to the generic configs
* CONFIG_ARCH_DMA_ADDR_T_64BIT * CONFIG_ARCH_HAS_ILOG2_U32 * CONFIG_ARCH_HAS_ILOG2_U64 * CONFIG_ARCH_PHYS_ADDR_T_64BIT * CONFIG_ARCH_SUPPORTS_MSI * CONFIG_GENERIC_CPU_DEVICES * CONFIG_HWMON_DEBUG_CHIP * CONFIG_I2C_PXA_PCI * CONFIG_LEDS_GPIO * CONFIG_MINIX_FS_NATIVE_ENDIAN * CONFIG_MLX4_CORE * CONFIG_POWER_SUPPLY * CONFIG_POWER_SUPPLY_DEBUG * CONFIG_QUOTACTL * CONFIG_SDIO_UART * CONFIG_SENSORS_K10TEMP * CONFIG_SENSORS_SCH56XX_COMMON * CONFIG_SENSORS_VIA_CPUTEMP * CONFIG_SERIO_AMBAKMI * CONFIG_SERIO_I8042 * CONFIG_SERIO_LIBPS2 * CONFIG_SERIO_PCIPS2 * CONFIG_SERIO_RAW * CONFIG_SERIO_SERPORT * CONFIG_SPI_BITBANG * CONFIG_SPI_GPIO git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31737 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/alix2/config-default7
-rw-r--r--target/linux/x86/config-3.28
-rw-r--r--target/linux/x86/config-3.38
-rw-r--r--target/linux/x86/config-default6
-rw-r--r--target/linux/x86/geos/config-default7
-rw-r--r--target/linux/x86/net5501/config-default7
-rw-r--r--target/linux/x86/olpc/config-default1
7 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/x86/alix2/config-default b/target/linux/x86/alix2/config-default
index def5482ad3..cc3de96809 100644
--- a/target/linux/x86/alix2/config-default
+++ b/target/linux/x86/alix2/config-default
@@ -10,19 +10,12 @@ CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HIGHMEM64G is not set
CONFIG_HWMON=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
# CONFIG_M486 is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MGEODE_LX=y
CONFIG_PATA_CS5536=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_POWER_SUPPLY is not set
# CONFIG_SCx200 is not set
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_SERPORT is not set
CONFIG_THERMAL_HWMON=y
-# CONFIG_SENSORS_K10TEMP is not set
-# CONFIG_SENSORS_VIA_CPUTEMP is not set
CONFIG_X86_DEBUGCTLMSR=y
diff --git a/target/linux/x86/config-3.2 b/target/linux/x86/config-3.2
index 2a2765431e..a9a3b8b905 100644
--- a/target/linux/x86/config-3.2
+++ b/target/linux/x86/config-3.2
@@ -7,7 +7,6 @@
# CONFIG_ALIX is not set
CONFIG_AMD_NB=y
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_ARCH_HAS_CPU_RELAX=y
@@ -16,7 +15,6 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
# CONFIG_ARCH_RANDOM is not set
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -195,7 +193,6 @@ CONFIG_JBD2=y
CONFIG_KALLSYMS=y
CONFIG_KEXEC=y
CONFIG_KTIME_SCALAR=y
-# CONFIG_LEDS_GPIO is not set
# CONFIG_M386 is not set
CONFIG_M486=y
# CONFIG_M586 is not set
@@ -218,7 +215,6 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
-# CONFIG_MLX4_CORE is not set
# CONFIG_MPENTIUM4 is not set
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
@@ -274,12 +270,10 @@ CONFIG_PERF_EVENTS=y
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x1000000
CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_PROCESSOR_SELECT is not set
CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_QUOTACTL is not set
CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y
# CONFIG_RELOCATABLE is not set
@@ -305,8 +299,6 @@ CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
diff --git a/target/linux/x86/config-3.3 b/target/linux/x86/config-3.3
index 4960689fd8..5a491b9670 100644
--- a/target/linux/x86/config-3.3
+++ b/target/linux/x86/config-3.3
@@ -7,7 +7,6 @@
# CONFIG_ALIX is not set
CONFIG_AMD_NB=y
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_ARCH_HAS_CPU_RELAX=y
@@ -16,7 +15,6 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
# CONFIG_ARCH_RANDOM is not set
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -197,7 +195,6 @@ CONFIG_JBD2=y
CONFIG_KALLSYMS=y
CONFIG_KEXEC=y
CONFIG_KTIME_SCALAR=y
-# CONFIG_LEDS_GPIO is not set
# CONFIG_M386 is not set
CONFIG_M486=y
# CONFIG_M586 is not set
@@ -220,7 +217,6 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
-# CONFIG_MLX4_CORE is not set
# CONFIG_MPENTIUM4 is not set
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
@@ -276,12 +272,10 @@ CONFIG_PERF_EVENTS=y
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x1000000
CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_PROCESSOR_SELECT is not set
CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_QUOTACTL is not set
CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y
# CONFIG_RELOCATABLE is not set
@@ -307,8 +301,6 @@ CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index 47c93ce984..38e2c22bae 100644
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -7,7 +7,6 @@
# CONFIG_ALIX is not set
CONFIG_AMD_NB=y
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_ARCH_HAS_CPU_RELAX=y
@@ -16,7 +15,6 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_ARCH_NO_SYSDEV_OPS=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -265,12 +263,10 @@ CONFIG_PERF_EVENTS=y
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x1000000
CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_PROCESSOR_SELECT is not set
CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_QUOTACTL is not set
CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y
# CONFIG_RELOCATABLE is not set
@@ -293,8 +289,6 @@ CONFIG_SERIO=y
# CONFIG_SERIO_CT82C710 is not set
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
diff --git a/target/linux/x86/geos/config-default b/target/linux/x86/geos/config-default
index dfe3080810..c01a66862e 100644
--- a/target/linux/x86/geos/config-default
+++ b/target/linux/x86/geos/config-default
@@ -10,7 +10,6 @@ CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HIGHMEM64G is not set
CONFIG_HWMON=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
# CONFIG_ISDN is not set
# CONFIG_M486 is not set
# CONFIG_MATH_EMULATION is not set
@@ -18,11 +17,5 @@ CONFIG_MGEODE_LX=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
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_SERPORT is not set
CONFIG_THERMAL_HWMON=y
-# CONFIG_SENSORS_K10TEMP is not set
-# CONFIG_SENSORS_VIA_CPUTEMP is not set
diff --git a/target/linux/x86/net5501/config-default b/target/linux/x86/net5501/config-default
index d2536faede..224b7d3244 100644
--- a/target/linux/x86/net5501/config-default
+++ b/target/linux/x86/net5501/config-default
@@ -7,18 +7,11 @@ CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HIGHMEM64G is not set
CONFIG_HWMON=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
# CONFIG_ISDN is not set
# CONFIG_M486 is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MGEODE_LX=y
CONFIG_NET5501=y
CONFIG_PATA_CS5536=y
-# CONFIG_POWER_SUPPLY is not set
# CONFIG_SCx200 is not set
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_SERPORT is not set
CONFIG_THERMAL_HWMON=y
-# CONFIG_SENSORS_K10TEMP is not set
-# CONFIG_SENSORS_VIA_CPUTEMP is not set
diff --git a/target/linux/x86/olpc/config-default b/target/linux/x86/olpc/config-default
index 368ae8863c..084d9df33c 100644
--- a/target/linux/x86/olpc/config-default
+++ b/target/linux/x86/olpc/config-default
@@ -124,7 +124,6 @@ CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_DEBUG=y
# CONFIG_SCx200 is not set
-# CONFIG_SDIO_UART is not set
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
CONFIG_TIMER_STATS=y