diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 17:56:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 17:56:42 -0500 |
| commit | 1de8cd3cb9f61e854e743c7210df43db517d4832 (patch) | |
| tree | 2b69c5ba5e4094037fa04d0fcb6c4537c222cde8 /arch/parisc/kernel/pdc_cons.c | |
| parent | 1eb1b3b65dc3e3ffcc6a60e115c085c0c11c1077 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/parisc/kernel/pdc_cons.c')
| -rw-r--r-- | arch/parisc/kernel/pdc_cons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c index ccb68090781e..1ff366cb9685 100644 --- a/arch/parisc/kernel/pdc_cons.c +++ b/arch/parisc/kernel/pdc_cons.c | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | #include <linux/tty.h> | 52 | #include <linux/tty.h> |
| 53 | #include <asm/pdc.h> /* for iodc_call() proto and friends */ | 53 | #include <asm/pdc.h> /* for iodc_call() proto and friends */ |
| 54 | 54 | ||
| 55 | static spinlock_t pdc_console_lock = SPIN_LOCK_UNLOCKED; | 55 | static DEFINE_SPINLOCK(pdc_console_lock); |
| 56 | 56 | ||
| 57 | static void pdc_console_write(struct console *co, const char *s, unsigned count) | 57 | static void pdc_console_write(struct console *co, const char *s, unsigned count) |
| 58 | { | 58 | { |