diff options
| author | David Mosberger <davidm@wailua.hpl.hp.com> | 2002-03-08 21:49:33 -0800 |
|---|---|---|
| committer | David Mosberger <davidm@wailua.hpl.hp.com> | 2002-03-08 21:49:33 -0800 |
| commit | 8e4a8959696c516703ddfefa278470be8ec1aca2 (patch) | |
| tree | 5b6c88223cb313cdde6a7dd8ebe75cd62d000692 /kernel | |
| parent | c39e9205e9c097cfa94117a2e452957d2ce03c9e (diff) | |
| parent | 5bedd81bebe867bef34a42284d291a787f1fd02f (diff) | |
Sync up with Linus's tree and resolve conflicts in perfmon.c.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 00f07e116885..7d8e4a167222 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -29,7 +29,7 @@ #include <asm/uaccess.h> -#ifdef CONFIG_MULTIQUAD +#if defined(CONFIG_MULTIQUAD) || defined(CONFIG_IA64) #define LOG_BUF_LEN (65536) #elif defined(CONFIG_SMP) #define LOG_BUF_LEN (32768) |