include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[net-next-2.6.git] / drivers / video / imsttfb.c

diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 5715b8ad0ddc87ae0c301c3b432df4d268541446..efb2c10656b0a89aa88d23276d47926805bbb4b2 100644 (file)
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -29,7 +28,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #if defined(CONFIG_PPC)
 #include <linux/nvram.h>
@@ -1151,8 +1150,10 @@ imsttfb_load_cursor_image(struct imstt_par *par, int width, int height, __u8 fgc
                                par->cmap_regs[TVPCRDAT] = 0xff;                eieio();
                        }
                par->cmap_regs[TVPCADRW] = 0x00;        eieio();
-               for (x = 0; x < 12; x++)
-                       par->cmap_regs[TVPCDATA] = fgc; eieio();
+               for (x = 0; x < 12; x++) {
+                       par->cmap_regs[TVPCDATA] = fgc;
+                       eieio();
+               }
        }
        return 1;
 }
@@ -1391,7 +1392,7 @@ init_imstt(struct fb_info *info)
                }
        }
 
-#if USE_NV_MODES && defined(CONFIG_PPC)
+#if USE_NV_MODES && defined(CONFIG_PPC32)
        {
                int vmode = init_vmode, cmode = init_cmode;
 
@@ -1476,7 +1477,7 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        
        dp = pci_device_to_OF_node(pdev);
        if(dp)
-               printk(KERN_INFO "%s: OF name %s\n",__FUNCTION__, dp->name);
+               printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
        else
                printk(KERN_ERR "imsttfb: no OF node for pci device\n");
 #endif /* CONFIG_PPC_OF */