diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-27 20:01:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-27 20:01:37 -0400 |
| commit | 37e53db8aa233c65142d63b496277bf5be9c0ade (patch) | |
| tree | c4b7409825cc0497593e94dd7d6f874d22b0b3f0 /drivers | |
| parent | 94b1661d08a27a8d2b1b0127c272987b0ab4ad6a (diff) | |
| parent | 7384c8bd90a4932517872f9807d34979a6fd29c4 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] update sn2 defconfig
[IA64] Add mca recovery failure messages
[IA64-SGI] fix SGI Altix tioce_reserve_m32() bug
[IA64] enable dumps to capture second page of kernel stack
[IA64-SGI] - Reduce overhead of reading sn_topology
[IA64-SGI] - Fix discover of nearest cpu node to IO node
[IA64] IOC4 config option ordering
[IA64] Setup an IA64 specific reclaim distance
[IA64] eliminate compile time warnings
[IA64] eliminate compile time warnings
[IA64-SGI] SN SAL call to inject memory errors
[IA64] - Fix MAX_PXM_DOMAINS for systems with > 256 nodes
[IA64] Remove unused variable in sn_sal.h
[IA64] Remove redundant NULL checks before kfree
[IA64] wire up compat_sys_adjtimex()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 5c91d6afb117..aeb5ab2391e4 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -68,8 +68,6 @@ source "drivers/leds/Kconfig" | |||
| 68 | 68 | ||
| 69 | source "drivers/infiniband/Kconfig" | 69 | source "drivers/infiniband/Kconfig" |
| 70 | 70 | ||
| 71 | source "drivers/sn/Kconfig" | ||
| 72 | |||
| 73 | source "drivers/edac/Kconfig" | 71 | source "drivers/edac/Kconfig" |
| 74 | 72 | ||
| 75 | source "drivers/rtc/Kconfig" | 73 | source "drivers/rtc/Kconfig" |