diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/scsi/dtc.c | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'drivers/scsi/dtc.c')
-rw-r--r-- | drivers/scsi/dtc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index fbfb39306..112ff9b72 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c @@ -177,7 +177,7 @@ static const struct signature { * */ -__initfunc(void dtc_setup(char *str, int *ints)) { +void __init dtc_setup(char *str, int *ints){ static int commandline_current = 0; int i; if (ints[0] != 2) @@ -208,8 +208,7 @@ __initfunc(void dtc_setup(char *str, int *ints)) { * */ - -__initfunc(int dtc_detect(Scsi_Host_Template * tpnt)) { +int __init dtc_detect(Scsi_Host_Template * tpnt){ static int current_override = 0, current_base = 0; struct Scsi_Host *instance; unsigned int base; |