diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /arch/m32r/kernel/setup.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/m32r/kernel/setup.c')
| -rw-r--r-- | arch/m32r/kernel/setup.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index c2e4dccf0112..d742037a7ccb 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c | |||
| @@ -37,12 +37,6 @@ | |||
| 37 | extern void init_mmu(void); | 37 | extern void init_mmu(void); |
| 38 | #endif | 38 | #endif |
| 39 | 39 | ||
| 40 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_HD) \ | ||
| 41 | || defined(CONFIG_BLK_DEV_IDE_MODULE) \ | ||
| 42 | || defined(CONFIG_BLK_DEV_HD_MODULE) | ||
| 43 | struct drive_info_struct { char dummy[32]; } drive_info; | ||
| 44 | #endif | ||
| 45 | |||
| 46 | extern char _end[]; | 40 | extern char _end[]; |
| 47 | 41 | ||
| 48 | /* | 42 | /* |