drbd: Do not Oops when C_STANDALONE when uuid gets generated

[safe/jmp/linux-2.6] / drivers / video / ffb.c

diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 7992b13..a42faba 100644 (file)
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
@@ -1042,7 +1041,7 @@ static int __devexit ffb_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id ffb_match[] = {
+static const struct of_device_id ffb_match[] = {
        {
                .name = "SUNW,ffb",
        },