diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-02-02 13:30:59 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-02-02 13:30:59 -0800 |
| commit | 41db6112a5558bd09c8ec5b0e61566db11f0d86d (patch) | |
| tree | 9d17f274bc6bc9737c911bc0010fec790d7b7892 | |
| parent | a58786917ce23c2a26c3e099c3cdba32a35eeceb (diff) | |
| parent | 466575f4e975db1207c5e1a7be34aeaec6ddba1e (diff) | |
Pull sgi-drivers-makefile-cleanup into release branch
| -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 a1942f79638..845cd0902a5 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -373,6 +373,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/ |