diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /arch/ppc/platforms/prpmc800.c | |
| parent | 2995bfb7855aabd493f840af361f3dd7d221caea (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ppc/platforms/prpmc800.c')
| -rw-r--r-- | arch/ppc/platforms/prpmc800.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/platforms/prpmc800.c b/arch/ppc/platforms/prpmc800.c index 8b09fa69b35b..de7baefacd3a 100644 --- a/arch/ppc/platforms/prpmc800.c +++ b/arch/ppc/platforms/prpmc800.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/initrd.h> | 22 | #include <linux/initrd.h> |
| 23 | #include <linux/console.h> | 23 | #include <linux/console.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/irq.h> | ||
| 26 | #include <linux/seq_file.h> | 25 | #include <linux/seq_file.h> |
| 27 | #include <linux/ide.h> | 26 | #include <linux/ide.h> |
| 28 | #include <linux/root_dev.h> | 27 | #include <linux/root_dev.h> |