diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
| commit | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch) | |
| tree | db3d7519932549bf528f5b8e4cb8350356cd544d /drivers/Kconfig | |
| parent | 79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 59f33fa6af3e..d19b6f5a1106 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -101,4 +101,6 @@ source "drivers/auxdisplay/Kconfig" | |||
| 101 | source "drivers/uio/Kconfig" | 101 | source "drivers/uio/Kconfig" |
| 102 | 102 | ||
| 103 | source "drivers/xen/Kconfig" | 103 | source "drivers/xen/Kconfig" |
| 104 | |||
| 105 | source "drivers/staging/Kconfig" | ||
| 104 | endmenu | 106 | endmenu |