diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-27 21:29:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-27 21:29:53 -0400 |
commit | fa453a625de5b8ee9ada0a5b329df3f88751c615 (patch) | |
tree | 7a9e04d4a44bb929e96bd9bebb7b97cb733d1ecb /drivers | |
parent | 30eebb54b13ef198a3f1a143ee9dd68f295c60de (diff) | |
parent | 3463ff4439661d8107ac024329b5fe01d6e5117b (diff) |
Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"Mostly bug fixes and cleanups"
* 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (35 commits)
um: Update defconfig
um: Switch to large mcmodel on x86_64
MTD: Relax dependencies
um: Wire CONFIG_GENERIC_IO up
um: Serve io_remap_pfn_range()
Introduce CONFIG_GENERIC_IO
um: allow SUBARCH=x86
um: most of the SUBARCH uses can be killed
um: deadlock in line_write_interrupt()
um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS
um: use the right ifdef around exports in user_syms.c
um: a bunch of headers can be killed by using generic-y
um: ptrace-generic.h doesn't need user.h
um: kill HOST_TASK_PID
um: remove pointless include of asm/fixmap.h from asm/pgtable.h
um: asm-offsets.h might as well come from underlying arch...
um: merge processor_{32,64}.h a bit...
um: switch close_chan() to struct line
um: race fix: initialize delayed_work *before* registering IRQ
um: line->have_irq is never checked...
...
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/devices/Kconfig | 1 | ||||
-rw-r--r-- | drivers/mtd/maps/Kconfig | 1 | ||||
-rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/onenand/Kconfig | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 1be621841400..284cf3433720 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | menuconfig MTD | 1 | menuconfig MTD |
2 | tristate "Memory Technology Device (MTD) support" | 2 | tristate "Memory Technology Device (MTD) support" |
3 | depends on HAS_IOMEM | 3 | depends on GENERIC_IO |
4 | help | 4 | help |
5 | Memory Technology Devices are flash, RAM and similar chips, often | 5 | Memory Technology Devices are flash, RAM and similar chips, often |
6 | used for solid state file systems on embedded devices. This option | 6 | used for solid state file systems on embedded devices. This option |
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig index 37b05c3f2792..8d3dac40d7e6 100644 --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig | |||
@@ -1,5 +1,6 @@ | |||
1 | menu "Self-contained MTD device drivers" | 1 | menu "Self-contained MTD device drivers" |
2 | depends on MTD!=n | 2 | depends on MTD!=n |
3 | depends on HAS_IOMEM | ||
3 | 4 | ||
4 | config MTD_PMC551 | 5 | config MTD_PMC551 |
5 | tristate "Ramix PMC551 PCI Mezzanine RAM card support" | 6 | tristate "Ramix PMC551 PCI Mezzanine RAM card support" |
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 6c5c431c64af..8af67cfd671a 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -1,5 +1,6 @@ | |||
1 | menu "Mapping drivers for chip access" | 1 | menu "Mapping drivers for chip access" |
2 | depends on MTD!=n | 2 | depends on MTD!=n |
3 | depends on HAS_IOMEM | ||
3 | 4 | ||
4 | config MTD_COMPLEX_MAPPINGS | 5 | config MTD_COMPLEX_MAPPINGS |
5 | bool "Support non-linear mappings of flash chips" | 6 | bool "Support non-linear mappings of flash chips" |
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 3d8d2d83995f..a3c4de551ebe 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
@@ -246,6 +246,7 @@ config MTD_NAND_BCM_UMI_HWCS | |||
246 | config MTD_NAND_DISKONCHIP | 246 | config MTD_NAND_DISKONCHIP |
247 | tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)" | 247 | tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)" |
248 | depends on EXPERIMENTAL | 248 | depends on EXPERIMENTAL |
249 | depends on HAS_IOMEM | ||
249 | select REED_SOLOMON | 250 | select REED_SOLOMON |
250 | select REED_SOLOMON_DEC16 | 251 | select REED_SOLOMON_DEC16 |
251 | help | 252 | help |
@@ -431,6 +432,7 @@ config MTD_NAND_GPMI_NAND | |||
431 | 432 | ||
432 | config MTD_NAND_PLATFORM | 433 | config MTD_NAND_PLATFORM |
433 | tristate "Support for generic platform NAND driver" | 434 | tristate "Support for generic platform NAND driver" |
435 | depends on HAS_IOMEM | ||
434 | help | 436 | help |
435 | This implements a generic NAND driver for on-SOC platform | 437 | This implements a generic NAND driver for on-SOC platform |
436 | devices. You will need to provide platform-specific functions | 438 | devices. You will need to provide platform-specific functions |
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig index 772ad2966619..91467bb03634 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/onenand/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | menuconfig MTD_ONENAND | 1 | menuconfig MTD_ONENAND |
2 | tristate "OneNAND Device Support" | 2 | tristate "OneNAND Device Support" |
3 | depends on MTD | 3 | depends on MTD |
4 | depends on HAS_IOMEM | ||
4 | help | 5 | help |
5 | This enables support for accessing all type of OneNAND flash | 6 | This enables support for accessing all type of OneNAND flash |
6 | devices. For further information see | 7 | devices. For further information see |