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/sandpoint.c | |
| parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
| parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) | |
Merge from Linus' tree
Diffstat (limited to 'arch/ppc/platforms/sandpoint.c')
| -rw-r--r-- | arch/ppc/platforms/sandpoint.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c index 84c96cb9ac2b..d4c9781989fb 100644 --- a/arch/ppc/platforms/sandpoint.c +++ b/arch/ppc/platforms/sandpoint.c | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | #include <linux/initrd.h> | 74 | #include <linux/initrd.h> |
| 75 | #include <linux/console.h> | 75 | #include <linux/console.h> |
| 76 | #include <linux/delay.h> | 76 | #include <linux/delay.h> |
| 77 | #include <linux/irq.h> | ||
| 78 | #include <linux/ide.h> | 77 | #include <linux/ide.h> |
| 79 | #include <linux/seq_file.h> | 78 | #include <linux/seq_file.h> |
| 80 | #include <linux/root_dev.h> | 79 | #include <linux/root_dev.h> |