git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
macintosh
/
adb-iop.c
diff --git
a/drivers/macintosh/adb-iop.c
b/drivers/macintosh/adb-iop.c
index
17ef5d3
..
4446966
100644
(file)
--- a/
drivers/macintosh/adb-iop.c
+++ b/
drivers/macintosh/adb-iop.c
@@
-19,7
+19,6
@@
#include <linux/init.h>
#include <linux/proc_fs.h>
-#include <asm/bootinfo.h>
#include <asm/macintosh.h>
#include <asm/macints.h>
#include <asm/mac_iop.h>