diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-06-11 11:57:21 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-10 09:49:41 -0400 |
| commit | 547d8bb7ddf7f5d9f53741086a394c8318e15f16 (patch) | |
| tree | 0d5c0bd50701771a39496d7bdec0db4d10d067ff /drivers/char/ip2/ip2base.c | |
| parent | 27d202fff1555f5b0eb16a5aedc452566f9ab8bb (diff) | |
ip2: use request_firmware()
Converted with help from Jaswinder Singh
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Alan Cox <alan@redhat.com>
Diffstat (limited to 'drivers/char/ip2/ip2base.c')
| -rw-r--r-- | drivers/char/ip2/ip2base.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/ip2/ip2base.c b/drivers/char/ip2/ip2base.c index 435ccfc74958..8155e247c04b 100644 --- a/drivers/char/ip2/ip2base.c +++ b/drivers/char/ip2/ip2base.c | |||
| @@ -21,10 +21,9 @@ | |||
| 21 | #endif | 21 | #endif |
| 22 | 22 | ||
| 23 | #include "ip2types.h" | 23 | #include "ip2types.h" |
| 24 | #include "fip_firm.h" // the meat | ||
| 25 | 24 | ||
| 26 | int | 25 | int |
| 27 | ip2_loadmain(int *, int *, unsigned char *, int ); // ref into ip2main.c | 26 | ip2_loadmain(int *, int *); // ref into ip2main.c |
| 28 | 27 | ||
| 29 | /* Note: Add compiled in defaults to these arrays, not to the structure | 28 | /* Note: Add compiled in defaults to these arrays, not to the structure |
| 30 | in ip2.h any longer. That structure WILL get overridden | 29 | in ip2.h any longer. That structure WILL get overridden |
| @@ -52,7 +51,7 @@ static int __init ip2_init(void) | |||
| 52 | irq[0] = irq[1] = irq[2] = irq[3] = 0; | 51 | irq[0] = irq[1] = irq[2] = irq[3] = 0; |
| 53 | } | 52 | } |
| 54 | 53 | ||
| 55 | return ip2_loadmain(io,irq,(unsigned char *)fip_firm,sizeof(fip_firm)); | 54 | return ip2_loadmain(io, irq); |
| 56 | } | 55 | } |
| 57 | module_init(ip2_init); | 56 | module_init(ip2_init); |
| 58 | 57 | ||