diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /arch/ppc/platforms/4xx | |
| parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
| parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) | |
Merge from Linus' tree
Diffstat (limited to 'arch/ppc/platforms/4xx')
| -rw-r--r-- | arch/ppc/platforms/4xx/bamboo.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/ebony.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/luan.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/ocotea.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c index ac391d463d78..78a403b48dba 100644 --- a/arch/ppc/platforms/4xx/bamboo.c +++ b/arch/ppc/platforms/4xx/bamboo.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/ide.h> | 28 | #include <linux/ide.h> |
| 29 | #include <linux/initrd.h> | 29 | #include <linux/initrd.h> |
| 30 | #include <linux/irq.h> | ||
| 31 | #include <linux/seq_file.h> | 30 | #include <linux/seq_file.h> |
| 32 | #include <linux/root_dev.h> | 31 | #include <linux/root_dev.h> |
| 33 | #include <linux/tty.h> | 32 | #include <linux/tty.h> |
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c index 9decb72e7aaf..d32ae112f639 100644 --- a/arch/ppc/platforms/4xx/ebony.c +++ b/arch/ppc/platforms/4xx/ebony.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/ide.h> | 31 | #include <linux/ide.h> |
| 32 | #include <linux/initrd.h> | 32 | #include <linux/initrd.h> |
| 33 | #include <linux/irq.h> | ||
| 34 | #include <linux/seq_file.h> | 33 | #include <linux/seq_file.h> |
| 35 | #include <linux/root_dev.h> | 34 | #include <linux/root_dev.h> |
| 36 | #include <linux/tty.h> | 35 | #include <linux/tty.h> |
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c index a38e6f9ef858..16d953bda22c 100644 --- a/arch/ppc/platforms/4xx/luan.c +++ b/arch/ppc/platforms/4xx/luan.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 29 | #include <linux/ide.h> | 29 | #include <linux/ide.h> |
| 30 | #include <linux/initrd.h> | 30 | #include <linux/initrd.h> |
| 31 | #include <linux/irq.h> | ||
| 32 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
| 33 | #include <linux/root_dev.h> | 32 | #include <linux/root_dev.h> |
| 34 | #include <linux/tty.h> | 33 | #include <linux/tty.h> |
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c index 80028df1b445..506949c5dd29 100644 --- a/arch/ppc/platforms/4xx/ocotea.c +++ b/arch/ppc/platforms/4xx/ocotea.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 29 | #include <linux/ide.h> | 29 | #include <linux/ide.h> |
| 30 | #include <linux/initrd.h> | 30 | #include <linux/initrd.h> |
| 31 | #include <linux/irq.h> | ||
| 32 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
| 33 | #include <linux/root_dev.h> | 32 | #include <linux/root_dev.h> |
| 34 | #include <linux/tty.h> | 33 | #include <linux/tty.h> |