sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source
This commit is contained in:
David S. Miller
2009-02-04 16:51:58 -08:00
parent 4d7902f22b eda58a85ec
commit 005c79b3d4
148 changed files with 2448 additions and 1808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/Kconfig
View File

@@ -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"),