Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits) Kconfig: acpi: Fix typo in comment. misc latin1 to utf8 conversions devres: Fix a typo in devm_kfree comment btrfs: free-space-cache.c: remove extra semicolon. fat: Spelling s/obsolate/obsolete/g SCSI, pmcraid: Fix spelling error in a pmcraid_err() call tools/power turbostat: update fields in manpage mac80211: drop spelling fix types.h: fix comment spelling for 'architectures' typo fixes: aera -> area, exntension -> extension devices.txt: Fix typo of 'VMware'. sis900: Fix enum typo 'sis900_rx_bufer_status' decompress_bunzip2: remove invalid vi modeline treewide: Fix comment and string typo 'bufer' hyper-v: Update MAINTAINERS treewide: Fix typos in various parts of the kernel, and fix some comments. clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR gpio: Kconfig: drop unknown symbol 'CS5535_GPIO' leds: Kconfig: Fix typo 'D2NET_V2' sound: Kconfig: drop unknown symbol ARCH_CLPS7500 ... Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new kconfig additions, close to removed commented-out old ones)
This commit is contained in:
@@ -68,7 +68,6 @@ config AR7
|
||||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||
select SYS_SUPPORTS_ZBOOT_UART16550
|
||||
select ARCH_REQUIRE_GPIOLIB
|
||||
select GCD
|
||||
select VLYNQ
|
||||
help
|
||||
Support for the Texas Instruments AR7 System-on-a-Chip
|
||||
@@ -2369,10 +2368,6 @@ config TC
|
||||
Linux driver support status is documented at:
|
||||
<http://www.linux-mips.org/wiki/DECstation>
|
||||
|
||||
#config ACCESSBUS
|
||||
# bool "Access.Bus support"
|
||||
# depends on TC
|
||||
|
||||
config MMU
|
||||
bool
|
||||
default y
|
||||
|
@@ -1,9 +1,3 @@
|
||||
#config SGI_SN0_XXL
|
||||
# bool "IP27 XXL"
|
||||
# depends on SGI_IP27
|
||||
# This options adds support for userspace processes up to 16TB size.
|
||||
# Normally the limit is just .5TB.
|
||||
|
||||
choice
|
||||
prompt "Node addressing mode"
|
||||
depends on SGI_IP27
|
||||
|
@@ -71,7 +71,6 @@ config SIBYTE_SB1xxx_SOC
|
||||
bool
|
||||
select DMA_COHERENT
|
||||
select IRQ_CPU
|
||||
select SIBYTE_CFE
|
||||
select SWAP_IO_SPACE
|
||||
select SYS_SUPPORTS_32BIT_KERNEL
|
||||
select SYS_SUPPORTS_64BIT_KERNEL
|
||||
|
Reference in New Issue
Block a user