diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 11:39:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 11:39:39 +0200 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /drivers/char/ip2/ip2base.c | |
| parent | pkt_sched: Make default qdisc nonshared-multiqueue safe. (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-49997d75152b3d23c53b0fa730599f2f74c92c65.tar.xz linux-49997d75152b3d23c53b0fa730599f2f74c92c65.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
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 @@ #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); |