diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 14:47:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 14:47:11 -0400 |
| commit | 75d73126fd490e26a9bdfc2338ca068e71563e0b (patch) | |
| tree | f8e7b7c8c46b537115ddf89013d0372dee19ca45 /drivers | |
| parent | b77d643ced576bdd1e918aebda869de74696cde9 (diff) | |
| parent | 6a915c2bf073743dd31229f1ec2eaa7a2b13c1c3 (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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/agp/parisc-agp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c index 17e380f5f818..94821ab01c6d 100644 --- a/drivers/char/agp/parisc-agp.c +++ b/drivers/char/agp/parisc-agp.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/klist.h> | 19 | #include <linux/klist.h> |
| 20 | #include <linux/agp_backend.h> | 20 | #include <linux/agp_backend.h> |
| 21 | #include <linux/log2.h> | 21 | #include <linux/log2.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/parisc-device.h> | 24 | #include <asm/parisc-device.h> |
| 24 | #include <asm/ropes.h> | 25 | #include <asm/ropes.h> |