diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
| commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch) | |
| tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 /drivers/char | |
| parent | ae7462b4f1fe1f36b5d562dbd5202a2eba01f072 (diff) | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
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" | |||
| 761 | 761 | ||
| 762 | config NVRAM | 762 | config NVRAM |
| 763 | tristate "/dev/nvram support" | 763 | tristate "/dev/nvram support" |
| 764 | depends on ATARI || X86 || ARM || GENERIC_NVRAM | 764 | depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM |
| 765 | ---help--- | 765 | ---help--- |
| 766 | If you say Y here and create a character special file /dev/nvram | 766 | If you say Y here and create a character special file /dev/nvram |
| 767 | with major number 10 and minor number 144 using mknod ("man mknod"), | 767 | with major number 10 and minor number 144 using mknod ("man mknod"), |