Merge branch 'topic/nomm' into for-linus

[cascardo/linux.git] / drivers / nubus / nubus.c

diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c
index 2f047e5..b764ac2 100644 (file)
--- a/drivers/nubus/nubus.c
+++ b/drivers/nubus/nubus.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <asm/setup.h>
 #include <asm/system.h>
 #include <asm/page.h>
@@ -126,7 +127,7 @@ static void nubus_advance(unsigned char **ptr, int len, int map)
        {
                while(not_useful(p,map))
                        p++;
-                       p++;
+               p++;
                len--;
        }
        *ptr = p;