From 366376151fcd5b99cd8ee78cca1276c132b27b0a Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:38:09 +0200 Subject: [PATCH 01/16] alpha: drop unused Kconfig symbol Signed-off-by: Paul Bolle Reviewed-by: Matt Turner Signed-off-by: Michal Marek --- arch/alpha/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 60cde53d266c..c38c75092017 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -445,11 +445,6 @@ config ALPHA_EV67 Is this a machine based on the EV67 core? If in doubt, select N here and the machine will be treated as an EV6. -config ALPHA_EV7 - bool - depends on ALPHA_MARVEL - default y - config ALPHA_MCPCIA bool depends on ALPHA_RAWHIDE From 1cb85e803ae9f90d91e97cb3856d84b7dde51e06 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:38:16 +0200 Subject: [PATCH 02/16] sparc: drop unused Kconfig symbol Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- arch/sparc/Kconfig | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 42c67beadcae..29ead342a4a8 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -559,12 +559,7 @@ config SUN_OPENPROMFS Only choose N if you know in advance that you will not need to modify OpenPROM settings on the running system. -# Makefile helpers -config SPARC32_PCI - bool - default y - depends on SPARC32 && PCI - +# Makefile helper config SPARC64_PCI bool default y From 71e76e90ef24a6f10591937a48bd76d9111f7a1c Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:39:07 +0200 Subject: [PATCH 03/16] um: drop unused Kconfig symbol Signed-off-by: Paul Bolle Acked-by: Richard Weinberger Signed-off-by: Michal Marek --- arch/um/Kconfig.x86 | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86 index d31ecf346b4e..c2ca26c1a796 100644 --- a/arch/um/Kconfig.x86 +++ b/arch/um/Kconfig.x86 @@ -53,9 +53,6 @@ config ARCH_HAS_SC_SIGNALS config ARCH_REUSE_HOST_VSYSCALL_AREA def_bool !64BIT -config SMP_BROKEN - def_bool 64BIT - config GENERIC_HWEIGHT def_bool y From 79fd468200dfc68d8996e94f4f3d5eac832a652b Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:39:40 +0200 Subject: [PATCH 04/16] sh: drop unused Kconfig symbol Signed-off-by: Paul Bolle Tested-by: Nobuhiro Iwamatsu Signed-off-by: Michal Marek --- arch/sh/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index ff9177c8f643..2d39594bcdd6 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -101,10 +101,6 @@ config GENERIC_LOCKBREAK def_bool y depends on SMP && PREEMPT -config SYS_SUPPORTS_PM - bool - depends on !SMP - config ARCH_SUSPEND_POSSIBLE def_bool n From fd694a1ead63e0818d96ed3c94d91e9796d6390f Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:40:12 +0200 Subject: [PATCH 05/16] score: drop unused Kconfig symbols Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- arch/score/Kconfig | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 288add8d168f..df169e84db4e 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -52,16 +52,6 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_CLOCKEVENTS def_bool y -config SCHED_NO_NO_OMIT_FRAME_POINTER - def_bool y - -config GENERIC_SYSCALL_TABLE - def_bool y - -config SCORE_L1_CACHE_SHIFT - int - default "4" - menu "Kernel type" config 32BIT @@ -96,15 +86,6 @@ config STACKTRACE_SUPPORT source "init/Kconfig" -config PROBE_INITRD_HEADER - bool "Probe initrd header created by addinitrd" - depends on BLK_DEV_INITRD - help - Probe initrd header at the last page of kernel image. - Say Y here if you are using arch/score/boot/addinitrd.c to - add initrd or initramfs image to the kernel image. - Otherwise, say N. - config MMU def_bool y From 1a8fffff6737c0be0769ca273bb74a9337b549a6 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:40:17 +0200 Subject: [PATCH 06/16] m32r: drop unused Kconfig symbol Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- arch/m32r/Kconfig | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index b92b9445255d..0e0b312d90d2 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -322,13 +322,6 @@ config NODES_SHIFT default "1" depends on NEED_MULTIPLE_NODES -# turning this on wastes a bunch of space. -# Summit needs it only when NUMA is on -config BOOT_IOREMAP - bool - depends on NUMA - default n - endmenu From 3462c8e6c7f8a19082acb9f970c9f6916cc13ce4 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:40:29 +0200 Subject: [PATCH 07/16] samples: drop unused Kconfig symbol Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- samples/Kconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/samples/Kconfig b/samples/Kconfig index 96a7572853f7..41063e7592d2 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -61,10 +61,4 @@ config SAMPLE_KDB Build an example of how to dynamically add the hello command to the kdb shell. -config SAMPLE_HIDRAW - bool "Build simple hidraw example" - depends on HIDRAW && HEADERS_CHECK - help - Build an example of how to use hidraw from userspace. - endif # SAMPLES From c7c0fb77f3484ebd105cf895817295222b2e7639 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:41:06 +0200 Subject: [PATCH 08/16] arm: at91: drop unused Kconfig symbol Signed-off-by: Paul Bolle Acked-by: Nicolas Ferre Signed-off-by: Michal Marek --- arch/arm/mach-at91/Kconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 22484670e7ba..db23f3de0d84 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -190,12 +190,6 @@ if ARCH_AT91SAM9260 comment "AT91SAM9260 Variants" -config ARCH_AT91SAM9260_SAM9XE - bool "AT91SAM9XE" - help - Select this if you are using Atmel's AT91SAM9XE System-on-Chip. - They are basically AT91SAM9260s with various sizes of embedded Flash. - comment "AT91SAM9260 / AT91SAM9XE Board Type" config MACH_AT91SAM9260EK From 1e65eb83a2c249a84e83828b36a9a78b364e5877 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:41:27 +0200 Subject: [PATCH 09/16] openrisc: drop unused Kconfig symbols Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- arch/openrisc/Kconfig | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 4558bafbd1a2..fe4b912463c6 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -19,9 +19,6 @@ config OPENRISC config MMU def_bool y -config WISHBONE_BUS_BIG_ENDIAN - def_bool y - config SYMBOL_PREFIX string default "" @@ -160,15 +157,6 @@ config JUMP_UPON_UNHANDLED_EXCEPTION Say Y if you are unsure. -config OPENRISC_EXCEPTION_DEBUG - bool "Print processor state at each exception" - default n - help - This option will make your kernel unusable for all but kernel - debugging. - - Say N if you are unsure. - config OPENRISC_ESR_EXCEPTION_BUG_CHECK bool "Check for possible ESR exception bug" default n From 1d5b088114c81d2bc1beb63e1652e305389228c8 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:41:31 +0200 Subject: [PATCH 10/16] mips: drop unused Kconfig symbols Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- arch/mips/Kconfig | 14 -------------- arch/mips/powertv/Kconfig | 2 -- arch/mips/powertv/asic/Kconfig | 28 ---------------------------- 3 files changed, 44 deletions(-) delete mode 100644 arch/mips/powertv/asic/Kconfig diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 177cdaf83564..2ecf4326c19c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -820,10 +820,6 @@ config ARCH_HAS_ILOG2_U64 bool default n -config ARCH_SUPPORTS_OPROFILE - bool - default y if !MIPS_MT_SMTC - config GENERIC_HWEIGHT bool default y @@ -2252,16 +2248,6 @@ config HZ source "kernel/Kconfig.preempt" -config MIPS_INSANE_LARGE - bool "Support for large 64-bit configurations" - depends on CPU_R10000 && 64BIT - help - MIPS R10000 does support a 44 bit / 16TB address space as opposed to - previous 64-bit processors which only supported 40 bit / 1TB. If you - need processes of more than 1TB virtual address space, say Y here. - This will result in additional memory usage, so it is not - recommended for normal users. - config KEXEC bool "Kexec system call (EXPERIMENTAL)" depends on EXPERIMENTAL diff --git a/arch/mips/powertv/Kconfig b/arch/mips/powertv/Kconfig index ff0e7e3e6954..1a1b03ea6398 100644 --- a/arch/mips/powertv/Kconfig +++ b/arch/mips/powertv/Kconfig @@ -1,5 +1,3 @@ -source "arch/mips/powertv/asic/Kconfig" - config BOOTLOADER_DRIVER bool "PowerTV Bootloader Driver Support" default n diff --git a/arch/mips/powertv/asic/Kconfig b/arch/mips/powertv/asic/Kconfig deleted file mode 100644 index 2016bfe94d66..000000000000 --- a/arch/mips/powertv/asic/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -config MIN_RUNTIME_RESOURCES - bool "Support for minimum runtime resources" - default n - depends on POWERTV - help - Enables support for minimizing the number of (SA asic) runtime - resources that are preallocated by the kernel. - -config MIN_RUNTIME_DOCSIS - bool "Support for minimum DOCSIS resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated DOCSIS resource. - -config MIN_RUNTIME_PMEM - bool "Support for minimum PMEM resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated Memory resource. - -config MIN_RUNTIME_TFTP - bool "Support for minimum TFTP resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated TFTP resource. From 21a06da3986f998108ad24b1c9fa11599a9f24f6 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:42:01 +0200 Subject: [PATCH 11/16] powerpc: 40x: drop unused Kconfig symbol Signed-off-by: Paul Bolle Acked-by: Josh Boyer Signed-off-by: Michal Marek --- arch/powerpc/platforms/40x/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig index d733d7ca939c..4bd3a27f0fa6 100644 --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig @@ -115,11 +115,6 @@ config PPC40x_SIMPLE help This option enables the simple PowerPC 40x platform support. -# 40x specific CPU modules, selected based on the board above. -config NP405H - bool - #depends on ASH - # OAK doesn't exist but wanted to keep this around for any future 403GCX boards config 403GCX bool From 6805ab6daa2b589fe3242d05ddc47a9dbb0c4eb1 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:42:06 +0200 Subject: [PATCH 12/16] powerpc: drop unused Kconfig symbols Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- arch/powerpc/Kconfig | 22 ---------------------- arch/powerpc/platforms/Kconfig.cputype | 8 -------- arch/powerpc/platforms/embedded6xx/Kconfig | 4 ---- arch/powerpc/platforms/prep/Kconfig | 9 --------- arch/powerpc/platforms/wsp/Kconfig | 5 ----- 5 files changed, 48 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 6926b61acfea..6887d80fe6e5 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -379,10 +379,6 @@ config PHYP_DUMP If unsure, say "N" -config PPCBUG_NVRAM - bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC - default y if PPC_PREP - config IRQ_ALL_CPUS bool "Distribute interrupts on all CPUs by default" depends on SMP && !MV64360 @@ -744,24 +740,6 @@ config 8260_PCI9 depends on PCI_8260 && !8272 default y -choice - prompt "IDMA channel for PCI 9 workaround" - depends on 8260_PCI9 - -config 8260_PCI9_IDMA1 - bool "IDMA1" - -config 8260_PCI9_IDMA2 - bool "IDMA2" - -config 8260_PCI9_IDMA3 - bool "IDMA3" - -config 8260_PCI9_IDMA4 - bool "IDMA4" - -endchoice - source "drivers/pci/pcie/Kconfig" source "drivers/pci/Kconfig" diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index e06e39589a09..f16f997af981 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -282,14 +282,6 @@ config PPC_MMU_NOHASH def_bool y depends on !PPC_STD_MMU -config PPC_MMU_NOHASH_32 - def_bool y - depends on PPC_MMU_NOHASH && PPC32 - -config PPC_MMU_NOHASH_64 - def_bool y - depends on PPC_MMU_NOHASH && PPC64 - config PPC_BOOK3E_MMU def_bool y depends on FSL_BOOKE || PPC_BOOK3E diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig index 524d971a1478..5a8f50a9afa7 100644 --- a/arch/powerpc/platforms/embedded6xx/Kconfig +++ b/arch/powerpc/platforms/embedded6xx/Kconfig @@ -87,10 +87,6 @@ config MV64X60 config MPC10X_OPENPIC bool -config MPC10X_STORE_GATHERING - bool "Enable MPC10x store gathering" - depends on MPC10X_BRIDGE - config GAMECUBE_COMMON bool diff --git a/arch/powerpc/platforms/prep/Kconfig b/arch/powerpc/platforms/prep/Kconfig index f0536c7cda9f..1547f66235d9 100644 --- a/arch/powerpc/platforms/prep/Kconfig +++ b/arch/powerpc/platforms/prep/Kconfig @@ -21,12 +21,3 @@ config PREP_RESIDUAL or pass the 'noresidual' option to the kernel. If you are running a PReP system, say Y here, otherwise say N. - -config PROC_PREPRESIDUAL - bool "Support for reading of PReP Residual Data in /proc" - depends on PREP_RESIDUAL && PROC_FS - help - Enabling this option will create a /proc/residual file which allows - you to get at the residual data on PReP systems. You will need a tool - (lsresidual) to parse it. If you aren't on a PReP system, you don't - want this. diff --git a/arch/powerpc/platforms/wsp/Kconfig b/arch/powerpc/platforms/wsp/Kconfig index c3c48eb62cc1..375f01ed1bdd 100644 --- a/arch/powerpc/platforms/wsp/Kconfig +++ b/arch/powerpc/platforms/wsp/Kconfig @@ -21,8 +21,3 @@ endmenu config PPC_A2_DD2 bool "Support for DD2 based A2/WSP systems" depends on PPC_A2 - -config WORKAROUND_ERRATUM_463 - depends on PPC_A2_DD2 - bool "Workaround erratum 463" - default y From 4f4d7a9ba0b7cdbc518cc04930323b15411eee14 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:42:34 +0200 Subject: [PATCH 13/16] x86: drop unused Kconfig symbol Signed-off-by: Paul Bolle Acked-by: David Rientjes Signed-off-by: Michal Marek --- arch/x86/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6a47bb22657f..18f74ed11c63 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -192,9 +192,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK config NEED_PER_CPU_PAGE_FIRST_CHUNK def_bool y -config HAVE_CPUMASK_OF_CPU_MAP - def_bool X86_64_SMP - config ARCH_HIBERNATION_POSSIBLE def_bool y From 2d3def0b73e33e5af2e81094710c07423e00b8be Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:43:05 +0200 Subject: [PATCH 14/16] stmmac: drop unused Kconfig symbol Signed-off-by: Paul Bolle Acked-by: Giuseppe Cavallaro Signed-off-by: Michal Marek --- drivers/net/stmmac/Kconfig | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/stmmac/Kconfig index 7df7df4e79c5..9e37a9a8d377 100644 --- a/drivers/net/stmmac/Kconfig +++ b/drivers/net/stmmac/Kconfig @@ -20,15 +20,6 @@ config STMMAC_DA By default, the DMA arbitration scheme is based on Round-robin (rx:tx priority is 1:1). -config STMMAC_DUAL_MAC - bool "STMMAC: dual mac support (EXPERIMENTAL)" - default n - depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER - help - Some ST SoCs (for example the stx7141 and stx7200c2) have two - Ethernet Controllers. This option turns on the second Ethernet - device on this kind of platforms. - config STMMAC_TIMER bool "STMMAC Timer optimisation" default n From a8d2de5e55183e2ec32228b3464be894cf7533c2 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:43:38 +0200 Subject: [PATCH 15/16] pci: drop unused Kconfig symbol There's no other Kconfig symbol that depends on XEN_PCIDEV_FE_DEBUG. Neither is there anything that uses CONFIG_XEN_PCIDEV_FE_DEBUG. Signed-off-by: Paul Bolle Reviewed-by: Konrad Rzeszutek Wilk Signed-off-by: Michal Marek --- drivers/pci/Kconfig | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 0fa466a91bf4..b42798fe44a9 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -51,17 +51,6 @@ config XEN_PCIDEV_FRONTEND The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains. -config XEN_PCIDEV_FE_DEBUG - bool "Xen PCI Frontend debugging" - depends on XEN_PCIDEV_FRONTEND && PCI_DEBUG - help - Say Y here if you want the Xen PCI frontend to produce a bunch of debug - messages to the system log. Select this if you are having a - problem with Xen PCI frontend support and want to see more of what is - going on. - - When in doubt, say N. - config HT_IRQ bool "Interrupts on hypertransport devices" default y From 536ec4f8d13433126f948d6e90821f811a4ebdf8 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:43:42 +0200 Subject: [PATCH 16/16] scsi: drop unused Kconfig symbol Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- drivers/scsi/Kconfig | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 8d9dae89f065..a757192ed584 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -607,20 +607,6 @@ config SCSI_ARCMSR To compile this driver as a module, choose M here: the module will be called arcmsr (modprobe arcmsr). -config SCSI_ARCMSR_AER - bool "Enable PCI Error Recovery Capability in Areca Driver(ARCMSR)" - depends on SCSI_ARCMSR && PCIEAER - default n - help - The advanced error reporting(AER) capability is "NOT" provided by - ARC1200/1201/1202 SATA RAID controllers cards. - If your card is one of ARC1200/1201/1202, please use the default setting, n. - If your card is other models, you could pick it - on condition that the kernel version is greater than 2.6.19. - This function is maintained driver by Nick Cheng. If you have any - problems or suggestion, you are welcome to contact with . - To enable this function, choose Y here. - source "drivers/scsi/megaraid/Kconfig.megaraid" source "drivers/scsi/mpt2sas/Kconfig"