diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /arch/powerpc/sysdev | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'arch/powerpc/sysdev')
| -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; | |||
| 59 | static u32 *dart_vbase; | 59 | static u32 *dart_vbase; |
| 60 | 60 | ||
| 61 | /* Mapped base address for the dart */ | 61 | /* Mapped base address for the dart */ |
| 62 | static unsigned int *__iomem dart; | 62 | static unsigned int __iomem *dart; |
| 63 | 63 | ||
| 64 | /* Dummy val that entries are set to when unused */ | 64 | /* Dummy val that entries are set to when unused */ |
| 65 | static unsigned int dart_emptyval; | 65 | static unsigned int dart_emptyval; |