diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /arch/h8300/kernel/setup.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/h8300/kernel/setup.c')
| -rw-r--r-- | arch/h8300/kernel/setup.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c index 313cd8081044..b2e86d0255e6 100644 --- a/arch/h8300/kernel/setup.c +++ b/arch/h8300/kernel/setup.c | |||
| @@ -33,10 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <asm/setup.h> | 34 | #include <asm/setup.h> |
| 35 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 36 | |||
| 37 | #ifdef CONFIG_BLK_DEV_INITRD | ||
| 38 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
| 39 | #endif | ||
| 40 | 37 | ||
| 41 | #if defined(__H8300H__) | 38 | #if defined(__H8300H__) |
| 42 | #define CPU "H8/300H" | 39 | #define CPU "H8/300H" |