diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-10 06:51:29 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 06:51:29 +0100 |
commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /arch/powerpc/sysdev/dart_iommu.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
parent | [PATCH] powerpc: Add FSL USB node to documentation (diff) | |
download | linux-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.tar.xz linux-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.zip |
Merge ../powerpc-merge
Diffstat (limited to 'arch/powerpc/sysdev/dart_iommu.c')
-rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 929ad2333aab..61d317428610 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c @@ -59,7 +59,7 @@ static unsigned long dart_tablesize; static u32 *dart_vbase; /* Mapped base address for the dart */ -static unsigned int *__iomem dart; +static unsigned int __iomem *dart; /* Dummy val that entries are set to when unused */ static unsigned int dart_emptyval; |