diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/sh64/kernel/sh_ksyms.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/sh64/kernel/sh_ksyms.c')
| -rw-r--r-- | arch/sh64/kernel/sh_ksyms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c index 6efdfa2c3994..4b2df7247b59 100644 --- a/arch/sh64/kernel/sh_ksyms.c +++ b/arch/sh64/kernel/sh_ksyms.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/in6.h> | 18 | #include <linux/in6.h> |
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/smp_lock.h> | 20 | #include <linux/smp_lock.h> |
| 21 | #include <linux/tty.h> | 21 | #include <linux/screen_info.h> |
| 22 | 22 | ||
| 23 | #include <asm/semaphore.h> | 23 | #include <asm/semaphore.h> |
| 24 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |