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/85xx | |
| parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
| parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) | |
Merge from Linus' tree
Diffstat (limited to 'arch/ppc/platforms/85xx')
| -rw-r--r-- | arch/ppc/platforms/85xx/mpc8540_ads.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/85xx/mpc8560_ads.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/85xx/mpc85xx_ads_common.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/85xx/sbc8560.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/85xx/sbc85xx.c | 1 | ||||
| -rw-r--r-- | arch/ppc/platforms/85xx/stx_gp3.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c index f761fdf160db..7dc8a68acfd0 100644 --- a/arch/ppc/platforms/85xx/mpc8540_ads.c +++ b/arch/ppc/platforms/85xx/mpc8540_ads.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/major.h> | 24 | #include <linux/major.h> |
| 25 | #include <linux/console.h> | 25 | #include <linux/console.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/irq.h> | ||
| 28 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
| 29 | #include <linux/root_dev.h> | 28 | #include <linux/root_dev.h> |
| 30 | #include <linux/serial.h> | 29 | #include <linux/serial.h> |
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c index f2748c88665a..8841fd7da6ee 100644 --- a/arch/ppc/platforms/85xx/mpc8560_ads.c +++ b/arch/ppc/platforms/85xx/mpc8560_ads.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/major.h> | 24 | #include <linux/major.h> |
| 25 | #include <linux/console.h> | 25 | #include <linux/console.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/irq.h> | ||
| 28 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
| 29 | #include <linux/root_dev.h> | 28 | #include <linux/root_dev.h> |
| 30 | #include <linux/serial.h> | 29 | #include <linux/serial.h> |
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c index 18e952d1767c..bd3ac0136756 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c +++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/major.h> | 24 | #include <linux/major.h> |
| 25 | #include <linux/console.h> | 25 | #include <linux/console.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/irq.h> | ||
| 28 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
| 29 | #include <linux/serial.h> | 28 | #include <linux/serial.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c index 6267b294f704..9f9039498ae5 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c +++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/major.h> | 24 | #include <linux/major.h> |
| 25 | #include <linux/console.h> | 25 | #include <linux/console.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/irq.h> | ||
| 28 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
| 29 | #include <linux/serial.h> | 28 | #include <linux/serial.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c index 165df94d4aa6..c76760a781c1 100644 --- a/arch/ppc/platforms/85xx/sbc8560.c +++ b/arch/ppc/platforms/85xx/sbc8560.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/major.h> | 24 | #include <linux/major.h> |
| 25 | #include <linux/console.h> | 25 | #include <linux/console.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/irq.h> | ||
| 28 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
| 29 | #include <linux/root_dev.h> | 28 | #include <linux/root_dev.h> |
| 30 | #include <linux/serial.h> | 29 | #include <linux/serial.h> |
diff --git a/arch/ppc/platforms/85xx/sbc85xx.c b/arch/ppc/platforms/85xx/sbc85xx.c index 4f6d1ddd6fb8..c02f110219f5 100644 --- a/arch/ppc/platforms/85xx/sbc85xx.c +++ b/arch/ppc/platforms/85xx/sbc85xx.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/major.h> | 23 | #include <linux/major.h> |
| 24 | #include <linux/console.h> | 24 | #include <linux/console.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/irq.h> | ||
| 27 | #include <linux/seq_file.h> | 26 | #include <linux/seq_file.h> |
| 28 | #include <linux/serial.h> | 27 | #include <linux/serial.h> |
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c index c99b365d6110..20940f4044f4 100644 --- a/arch/ppc/platforms/85xx/stx_gp3.c +++ b/arch/ppc/platforms/85xx/stx_gp3.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/blkdev.h> | 30 | #include <linux/blkdev.h> |
| 31 | #include <linux/console.h> | 31 | #include <linux/console.h> |
| 32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 33 | #include <linux/irq.h> | ||
| 34 | #include <linux/root_dev.h> | 33 | #include <linux/root_dev.h> |
| 35 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
| 36 | #include <linux/serial.h> | 35 | #include <linux/serial.h> |