diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 11:47:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 11:47:11 -0700 |
| commit | 75d73126fd490e26a9bdfc2338ca068e71563e0b (patch) | |
| tree | f8e7b7c8c46b537115ddf89013d0372dee19ca45 /drivers | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | parisc-agp: fix missing slab.h include (diff) | |
| download | linux-dev-75d73126fd490e26a9bdfc2338ca068e71563e0b.tar.xz linux-dev-75d73126fd490e26a9bdfc2338ca068e71563e0b.zip | |
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 @@ #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> |