diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
| commit | 27710bf6febe8323f78bceca002ca7d71e5012a7 (patch) | |
| tree | 80a72f385ea28f9f7649363fe5147b3da37f9950 /drivers/serial/sh-sci.c | |
| parent | 9ef64cb4320df821638b508f79aa8b858cca99f0 (diff) | |
| parent | cad226b8a71f969ad05137e43b48c9e6059a0b9f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/sh-sci.c')
| -rw-r--r-- | drivers/serial/sh-sci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 9ce12cb2cebc..a8c116b80bff 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 42 | #include <linux/console.h> | 42 | #include <linux/console.h> |
| 43 | #include <linux/platform_device.h> | 43 | #include <linux/platform_device.h> |
| 44 | #include <linux/serial_sci.h> | ||
| 44 | 45 | ||
| 45 | #ifdef CONFIG_CPU_FREQ | 46 | #ifdef CONFIG_CPU_FREQ |
| 46 | #include <linux/notifier.h> | 47 | #include <linux/notifier.h> |
| @@ -54,7 +55,6 @@ | |||
| 54 | #include <asm/kgdb.h> | 55 | #include <asm/kgdb.h> |
| 55 | #endif | 56 | #endif |
| 56 | 57 | ||
| 57 | #include <asm/sci.h> | ||
| 58 | #include "sh-sci.h" | 58 | #include "sh-sci.h" |
| 59 | 59 | ||
| 60 | struct sci_port { | 60 | struct sci_port { |