diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /arch/mips/au1000/common/setup.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'arch/mips/au1000/common/setup.c')
| -rw-r--r-- | arch/mips/au1000/common/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index 377ae0d8ff00..919172db560c 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <asm/mach-au1x00/au1000.h> | 43 | #include <asm/mach-au1x00/au1000.h> |
| 44 | #include <asm/time.h> | 44 | #include <asm/time.h> |
| 45 | 45 | ||
| 46 | extern char * __init prom_getcmdline(void); | 46 | extern char * prom_getcmdline(void); |
| 47 | extern void __init board_setup(void); | 47 | extern void __init board_setup(void); |
| 48 | extern void au1000_restart(char *); | 48 | extern void au1000_restart(char *); |
| 49 | extern void au1000_halt(void); | 49 | extern void au1000_halt(void); |