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 13:22:03 -0800 |
| commit | 466575f4e975db1207c5e1a7be34aeaec6ddba1e (patch) | |
| tree | 37c0053f75f824d2df33c6f9962d6b4b102c1c8c | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
| download | kernel_samsung_smdk4412-466575f4e975db1207c5e1a7be34aeaec6ddba1e.tar.gz kernel_samsung_smdk4412-466575f4e975db1207c5e1a7be34aeaec6ddba1e.tar.bz2 kernel_samsung_smdk4412-466575f4e975db1207c5e1a7be34aeaec6ddba1e.zip | |
[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 199eeaf0f4e..8e5517e62c0 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -374,6 +374,9 @@ config IA64_PALINFO To use this option, you have to ensure that the "/proc file system support" (CONFIG_PROC_FS) is enabled, too. +config SGI_SN + def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) + source "drivers/firmware/Kconfig" source "fs/Kconfig.binfmt" diff --git a/drivers/Makefile b/drivers/Makefile index 619dd964c51..5c69b86db62 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -69,7 +69,7 @@ obj-$(CONFIG_EISA) += eisa/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_INFINIBAND) += infiniband/ -obj-$(CONFIG_SGI_IOC4) += sn/ +obj-$(CONFIG_SGI_SN) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ |