diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
| commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
| tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /arch/cris/kernel/setup.c | |
| parent | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff) | |
| parent | 2746b8623abce815aaae7afc946b1b39f8436f5a (diff) | |
Merge branch 'viro'
Diffstat (limited to 'arch/cris/kernel/setup.c')
| -rw-r--r-- | arch/cris/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c index d11206e467ab..1ba57efff60d 100644 --- a/arch/cris/kernel/setup.c +++ b/arch/cris/kernel/setup.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | /* | 24 | /* |
| 25 | * Setup options | 25 | * Setup options |
| 26 | */ | 26 | */ |
| 27 | struct drive_info_struct { char dummy[32]; } drive_info; | ||
| 28 | struct screen_info screen_info; | 27 | struct screen_info screen_info; |
| 29 | 28 | ||
| 30 | extern int root_mountflags; | 29 | extern int root_mountflags; |