diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 (GMT) |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 (GMT) |
| commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
| tree | 9336a14058eed66c335db10512f33a31f9e8c938 /arch/powerpc/sysdev | |
| parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
| parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) | |
| download | linux-fsl-qoriq-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.xz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 977de9d..6298264 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; |