diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
| commit | cff6bf970965c98c62007fc8a36527fd147fe233 (patch) | |
| tree | 2791f2208b54ade86625af416ff5342f11282f0c /arch/ppc/platforms/pmac_setup.c | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ppc/platforms/pmac_setup.c')
| -rw-r--r-- | arch/ppc/platforms/pmac_setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/platforms/pmac_setup.c b/arch/ppc/platforms/pmac_setup.c index 4c56a4734aec..d6356f480d90 100644 --- a/arch/ppc/platforms/pmac_setup.c +++ b/arch/ppc/platforms/pmac_setup.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <linux/adb.h> | 48 | #include <linux/adb.h> |
| 49 | #include <linux/cuda.h> | 49 | #include <linux/cuda.h> |
| 50 | #include <linux/pmu.h> | 50 | #include <linux/pmu.h> |
| 51 | #include <linux/irq.h> | ||
| 52 | #include <linux/seq_file.h> | 51 | #include <linux/seq_file.h> |
| 53 | #include <linux/root_dev.h> | 52 | #include <linux/root_dev.h> |
| 54 | #include <linux/bitops.h> | 53 | #include <linux/bitops.h> |