diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/cdrom/sonycd535.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/cdrom/sonycd535.c')
| -rw-r--r-- | drivers/cdrom/sonycd535.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c index b4bce6679..97b1afdde 100644 --- a/drivers/cdrom/sonycd535.c +++ b/drivers/cdrom/sonycd535.c @@ -1486,8 +1486,8 @@ static int sonycd535_block_size = CDU535_BLOCK_SIZE; /* * Initialize the driver. */ -__initfunc(int -sony535_init(void)) +int __init +sony535_init(void) { struct s535_sony_drive_config drive_config; Byte cmd_buff[3]; @@ -1655,8 +1655,8 @@ sony535_init(void)) * * the address value has to be the existing CDROM port address. */ -__initfunc(void -sonycd535_setup(char *strings, int *ints)) +void __init +sonycd535_setup(char *strings, int *ints) { /* if IRQ change and default io base desired, * then call with io base of 0 |