diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /arch/ia64 | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/defconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/sn/sn1/setup.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 00a0e05b7..d41bba5b1 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -242,6 +242,7 @@ CONFIG_EFI_RTC=y # CONFIG_HPFS_FS is not set # CONFIG_PROC_FS is not set # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set # CONFIG_DEVPTS_FS is not set # CONFIG_QNX4FS_FS is not set diff --git a/arch/ia64/sn/sn1/setup.c b/arch/ia64/sn/sn1/setup.c index 1e3a39ae3..45242fc26 100644 --- a/arch/ia64/sn/sn1/setup.c +++ b/arch/ia64/sn/sn1/setup.c @@ -70,7 +70,7 @@ sn1_setup(char **cmdline_p) outb(LATCH >> 8, 0x40); /* MSB */ printk("PIT: LATCH at 0x%x%x for %d HZ\n", LATCH >> 8, LATCH & 0xff, HZ); #endif -#ifdef __SMP__ +#ifdef CONFIG_SMP init_smp_config(); #endif screen_info = sn1_screen_info; |