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

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
75d73126 · Linus Torvalds · b77d643c · 6a915c2b · 75d73126
Commit 75d73126 authored Oct 29, 2010 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/char/agp/parisc-agp.c drivers/char/agp/parisc-agp.c +1 -0

No files found.
--- 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>