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 from Linus' tree
[pandora-kernel.git]
/
arch
/
ppc
/
platforms
/
85xx
/
mpc85xx_cds_common.c
diff --git
a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index
6267b29
..
9f90394
100644
(file)
--- a/
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@
-24,7
+24,6
@@
#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
-#include <linux/irq.h>
#include <linux/seq_file.h>
#include <linux/serial.h>
#include <linux/module.h>