diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 20:17:05 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 20:17:05 +0100 |
| commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
| tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /arch/m32r/kernel/setup.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird (diff) | |
| download | linux-70c07e02625ec46d0ffbfce1acef42d660803528.tar.xz linux-70c07e02625ec46d0ffbfce1acef42d660803528.zip | |
Merge branch 'viro'
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 @@ extern void init_mmu(void); #endif -#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_HD) \ - || defined(CONFIG_BLK_DEV_IDE_MODULE) \ - || defined(CONFIG_BLK_DEV_HD_MODULE) -struct drive_info_struct { char dummy[32]; } drive_info; -#endif - extern char _end[]; /* |