Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…

…kyle/parisc-2.6 * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: parisc-agp: fix missing slab.h include
git-mirror · Oct 29, 2010 · 75d7312 · 75d7312
2 parents b77d643 + 6a915c2
commit 75d7312
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
@@ -19,6 +19,7 @@
 #include <linux/klist.h>
 #include <linux/agp_backend.h>
 #include <linux/log2.h>
+#include <linux/slab.h>
 
 #include <asm/parisc-device.h>
 #include <asm/ropes.h>