diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 16:52:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 16:52:10 -0800 |
| commit | 7420b73dc05ae1faa36b49774210a13d29349c53 (patch) | |
| tree | 90cdba18724099353598e69b3ee9ee21df9582cf /drivers/char | |
| parent | 3e1c4005134e3a090c64c1bc35f965043bb451f4 (diff) | |
| parent | de8696203e64f19ea26f8e096ac8a796e78216b3 (diff) | |
| download | linux-next-7420b73dc05ae1faa36b49774210a13d29349c53.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
NVRAM depends on RTC_DRV_CMOS
rename platform_driver name "flash" to "sa1100-mtd"
annotate that [fp, #-4] is the saved lr
Use __SPIN_LOCK_UNLOCKED to initialize bad_irq_desc.lock
ARM: OMAP: fix fault in enter_full_retention()
ARM: OMAP: Mask interrupts when disabling interrupts, v2
ARM: OMAP: gptimer min_delta_ns corrected
ARM: OMAP: Fix hsmmc init, v2
ARM: OMAP: Fix omap34xx revision detection for ES3.1
ARM: OMAP: DMA: Fix uninitialized channel flags
ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling
ARM: OMAP: Fix McBSP spin_lock deadlock
[ARM] 5366/1: fix shared memory coherency with VIVT L1 + L2 caches
[ARM] call undefined instruction exception handler with irqs enabled
[ARM] msm: fix build errors
[ARM] etherh: continue fixing build failure
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index f5be8081cd81..735bbe2be51a 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -761,7 +761,7 @@ source "drivers/char/hw_random/Kconfig" config NVRAM tristate "/dev/nvram support" - depends on ATARI || X86 || ARM || GENERIC_NVRAM + depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM ---help--- If you say Y here and create a character special file /dev/nvram with major number 10 and minor number 144 using mknod ("man mknod"), |