diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-16 00:29:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 00:29:07 +0200 |
| commit | 82638844d9a8581bbf33201cc209a14876eca167 (patch) | |
| tree | 961d7f9360194421a71aa644a9d0c176a960ce49 /drivers/char/ip2/ip2base.c | |
| parent | 9982fbface82893e77d211fbabfbd229da6bdde6 (diff) | |
| parent | 63cf13b77ab785e87c867defa8545e6d4a989774 (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 435ccfc7495..8155e247c04 100644 --- a/drivers/char/ip2/ip2base.c +++ b/drivers/char/ip2/ip2base.c @@ -21,10 +21,9 @@ #endif #include "ip2types.h" -#include "fip_firm.h" // the meat int -ip2_loadmain(int *, int *, unsigned char *, int ); // ref into ip2main.c +ip2_loadmain(int *, int *); // ref into ip2main.c /* Note: Add compiled in defaults to these arrays, not to the structure in ip2.h any longer. That structure WILL get overridden @@ -52,7 +51,7 @@ static int __init ip2_init(void) irq[0] = irq[1] = irq[2] = irq[3] = 0; } - return ip2_loadmain(io,irq,(unsigned char *)fip_firm,sizeof(fip_firm)); + return ip2_loadmain(io, irq); } module_init(ip2_init); |