diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-31 00:14:15 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-31 00:14:15 +0200 |
| commit | a670fcb43f01a67ef56176afc76e5d43d128b25c (patch) | |
| tree | 09c9411c78a33ff980e9ea871bc7686e7589abbf /arch/ppc/platforms/tqm8260_setup.c | |
| parent | Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff) | |
| parent | [PATCH] agp: restore APBASE after setting APSIZE (diff) | |
| download | linux-a670fcb43f01a67ef56176afc76e5d43d128b25c.tar.xz linux-a670fcb43f01a67ef56176afc76e5d43d128b25c.zip | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'arch/ppc/platforms/tqm8260_setup.c')
| -rw-r--r-- | arch/ppc/platforms/tqm8260_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/tqm8260_setup.c b/arch/ppc/platforms/tqm8260_setup.c index a8880bfc034b..3409139330b1 100644 --- a/arch/ppc/platforms/tqm8260_setup.c +++ b/arch/ppc/platforms/tqm8260_setup.c @@ -16,8 +16,8 @@ #include <linux/init.h> -#include <asm/immap_cpm2.h> #include <asm/mpc8260.h> +#include <asm/cpm2.h> #include <asm/machdep.h> static int |