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/dio | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'drivers/dio')
-rw-r--r-- | drivers/dio/dio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index eaab1ab1f..ad4cc7544 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c @@ -112,7 +112,7 @@ struct dioboard static struct dioboard *blist = NULL; -__initfunc(static int dio_find_slow(int deviceid)) +static int __init dio_find_slow(int deviceid) { /* Called to find a DIO device before the full bus scan has run. Basically only used by the console driver. */ @@ -151,7 +151,7 @@ int dio_find(int deviceid) /* This is the function that scans the DIO space and works out what * hardware is actually present. */ -__initfunc(void dio_init(void)) +void __init dio_init(void) { int scode; struct dioboard *b, *bprev = NULL; |