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/cris/kernel/setup.c | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
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; |