diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-02 14:33:57 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-02 14:33:57 -0400 |
commit | 1fb5fef9b80d9a3b5368e22031627afd1585487b (patch) | |
tree | 54f07a532b5b2622b8642156bbcaeca637fcdb8f /arch/ia64/Kconfig | |
parent | 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e (diff) | |
parent | 330ab71619bacc4d4494227a6cfc9b7f5500403d (diff) | |
download | kernel-crypto-1fb5fef9b80d9a3b5368e22031627afd1585487b.tar.gz kernel-crypto-1fb5fef9b80d9a3b5368e22031627afd1585487b.tar.xz kernel-crypto-1fb5fef9b80d9a3b5368e22031627afd1585487b.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9f40eeff0b5..0f3076a820c 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -413,6 +413,8 @@ config IA64_PALINFO config SGI_SN def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) +source "drivers/sn/Kconfig" + source "drivers/firmware/Kconfig" source "fs/Kconfig.binfmt" |