diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /drivers/char/hvc_console.c | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'drivers/char/hvc_console.c')
| -rw-r--r-- | drivers/char/hvc_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 322bc5f7d86b..b3ab42e0dd4a 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
| @@ -674,7 +674,7 @@ static const cpumask_t cpus_in_xmon = CPU_MASK_NONE; | |||
| 674 | * calling hvc_poll() who determines whether a console adapter support | 674 | * calling hvc_poll() who determines whether a console adapter support |
| 675 | * interrupts. | 675 | * interrupts. |
| 676 | */ | 676 | */ |
| 677 | int khvcd(void *unused) | 677 | static int khvcd(void *unused) |
| 678 | { | 678 | { |
| 679 | int poll_mask; | 679 | int poll_mask; |
| 680 | struct hvc_struct *hp; | 680 | struct hvc_struct *hp; |