git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
setup.c
diff --git
a/arch/ia64/kernel/setup.c
b/arch/ia64/kernel/setup.c
index fc860778fa412b8c414ee7f9396b39dfddcb4cf0..eb388e271b2b5a73746f4454347882c04aa0c8cc 100644
(file)
--- a/
arch/ia64/kernel/setup.c
+++ b/
arch/ia64/kernel/setup.c
@@
-41,7
+41,6
@@
#include <linux/serial_core.h>
#include <linux/efi.h>
#include <linux/initrd.h>
-#include <linux/platform.h>
#include <linux/pm.h>
#include <linux/cpufreq.h>