aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 11:47:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 11:47:11 -0700
commit75d73126fd490e26a9bdfc2338ca068e71563e0b (patch)
treef8e7b7c8c46b537115ddf89013d0372dee19ca45
parentb77d643ced576bdd1e918aebda869de74696cde9 (diff)
parent6a915c2bf073743dd31229f1ec2eaa7a2b13c1c3 (diff)
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
-rw-r--r--drivers/char/agp/parisc-agp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index 17e380f5f81..94821ab01c6 100644
--- 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>