diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 12:43:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 12:43:40 -0400 |
| commit | 56616ebd0e49b7e5c67a19ca1d96e8ec382bcacf (patch) | |
| tree | 4dd91f57e974082d6f7c98f6cebfa42339a4353c /arch/sh64/kernel/setup.c | |
| parent | 203f3394397642f2f9d9ee760f03420459b7a8ef (diff) | |
| parent | 5ba056cb3c5d424dc2886fb02305af11fa46af02 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: arch/sh64/kernel/setup.c: duplicate include removal.
sh64: arch/sh64/kernel/signal.c: duplicate include removal
sh64: Add missing dma_sync_single_for_*().
Diffstat (limited to 'arch/sh64/kernel/setup.c')
| -rw-r--r-- | arch/sh64/kernel/setup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c index 53e9d20a874a..2b7264c0c6f7 100644 --- a/arch/sh64/kernel/setup.c +++ b/arch/sh64/kernel/setup.c | |||
| @@ -59,10 +59,6 @@ | |||
| 59 | #include <asm/setup.h> | 59 | #include <asm/setup.h> |
| 60 | #include <asm/smp.h> | 60 | #include <asm/smp.h> |
| 61 | 61 | ||
| 62 | #ifdef CONFIG_VT | ||
| 63 | #include <linux/console.h> | ||
| 64 | #endif | ||
| 65 | |||
| 66 | struct screen_info screen_info; | 62 | struct screen_info screen_info; |
| 67 | 63 | ||
| 68 | #ifdef CONFIG_BLK_DEV_RAM | 64 | #ifdef CONFIG_BLK_DEV_RAM |