diff options
author | Jes Sorensen <jes@sgi.com> | 2006-01-19 04:54:00 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-01-26 16:22:03 -0500 |
commit | 466575f4e975db1207c5e1a7be34aeaec6ddba1e (patch) | |
tree | 37c0053f75f824d2df33c6f9962d6b4b102c1c8c | |
parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) |
[PATCH] drivers/sn/ must be entered for CONFIG_SGI_IOC3
Actually I think this is more appropriate so we don't end up with 17
cases that add drivers/sn to the build lib.
Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC
is enabled.
Acked-by: Dave Jones <davej@redhat.com>
Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | arch/ia64/Kconfig | 3 | ||||
-rw-r--r-- | drivers/Makefile | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 199eeaf0f4e3..8e5517e62c0a 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -374,6 +374,9 @@ config IA64_PALINFO | |||
374 | To use this option, you have to ensure that the "/proc file system | 374 | To use this option, you have to ensure that the "/proc file system |
375 | support" (CONFIG_PROC_FS) is enabled, too. | 375 | support" (CONFIG_PROC_FS) is enabled, too. |
376 | 376 | ||
377 | config SGI_SN | ||
378 | def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) | ||
379 | |||
377 | source "drivers/firmware/Kconfig" | 380 | source "drivers/firmware/Kconfig" |
378 | 381 | ||
379 | source "fs/Kconfig.binfmt" | 382 | source "fs/Kconfig.binfmt" |
diff --git a/drivers/Makefile b/drivers/Makefile index 619dd964c51c..5c69b86db624 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -69,7 +69,7 @@ obj-$(CONFIG_EISA) += eisa/ | |||
69 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ | 69 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ |
70 | obj-$(CONFIG_MMC) += mmc/ | 70 | obj-$(CONFIG_MMC) += mmc/ |
71 | obj-$(CONFIG_INFINIBAND) += infiniband/ | 71 | obj-$(CONFIG_INFINIBAND) += infiniband/ |
72 | obj-$(CONFIG_SGI_IOC4) += sn/ | 72 | obj-$(CONFIG_SGI_SN) += sn/ |
73 | obj-y += firmware/ | 73 | obj-y += firmware/ |
74 | obj-$(CONFIG_CRYPTO) += crypto/ | 74 | obj-$(CONFIG_CRYPTO) += crypto/ |
75 | obj-$(CONFIG_SUPERH) += sh/ | 75 | obj-$(CONFIG_SUPERH) += sh/ |