git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
pmac.c
diff --git
a/drivers/ide/pmac.c
b/drivers/ide/pmac.c
index
850ee45
..
159955d
100644
(file)
--- a/
drivers/ide/pmac.c
+++ b/
drivers/ide/pmac.c
@@
-33,6
+33,7
@@
#include <linux/adb.h>
#include <linux/pmu.h>
#include <linux/scatterlist.h>
+#include <linux/slab.h>
#include <asm/prom.h>
#include <asm/io.h>