This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / sk98lin / skge.c

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 5db59c4..6cb5342 100644 (file)
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -72,8 +72,8 @@
  *             <linux/slab.h>
  *             <linux/interrupt.h>
  *             <linux/pci.h>
- *             <linux/bitops.h>
  *             <asm/byteorder.h>
+ *             <asm/bitops.h>
  *             <asm/io.h>
  *             <linux/netdevice.h>
  *             <linux/etherdevice.h>
@@ -303,7 +303,7 @@ int SkGeInitPCI(SK_AC *pAC)
        /*
         * Remap the regs into kernel space.
         */
-       pAC->IoBase = ioremap_nocache(dev->mem_start, 0x4000);
+       pAC->IoBase = (char*)ioremap_nocache(dev->mem_start, 0x4000);
 
        if (!pAC->IoBase){
                retval = 3;