diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /arch/sh64/kernel | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/sh64/kernel')
| -rw-r--r-- | arch/sh64/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/sh64/kernel/sh_ksyms.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c index 0359fa647bbc..ffb310e33cef 100644 --- a/arch/sh64/kernel/setup.c +++ b/arch/sh64/kernel/setup.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
| 37 | #include <linux/user.h> | 37 | #include <linux/user.h> |
| 38 | #include <linux/a.out.h> | 38 | #include <linux/a.out.h> |
| 39 | #include <linux/tty.h> | 39 | #include <linux/screen_info.h> |
| 40 | #include <linux/ioport.h> | 40 | #include <linux/ioport.h> |
| 41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 42 | #include <linux/init.h> | 42 | #include <linux/init.h> |
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> |