diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /arch/m32r/kernel/setup.c | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
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 | /* |