summaryrefslogtreecommitdiffstats
path: root/include/linux/ioc3.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-10 16:51:29 +1100
committerPaul Mackerras <paulus@samba.org>2006-02-10 16:51:29 +1100
commitd6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch)
treeeeec5011a42f38d3dfe7b61788b7ac1cc890edeb /include/linux/ioc3.h
parent8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff)
parentad71f123a9e9b809f6c829db1222ce0423a1153c (diff)
downloadop-kernel-dev-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.zip
op-kernel-dev-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.tar.gz
Merge ../powerpc-merge
Diffstat (limited to 'include/linux/ioc3.h')
-rw-r--r--include/linux/ioc3.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ioc3.h b/include/linux/ioc3.h
index e7906a7..da7c09e 100644
--- a/include/linux/ioc3.h
+++ b/include/linux/ioc3.h
@@ -27,7 +27,7 @@ struct ioc3_driver_data {
int id; /* IOC3 sequence number */
/* PCI mapping */
unsigned long pma; /* physical address */
- struct __iomem ioc3 *vma; /* pointer to registers */
+ struct ioc3 __iomem *vma; /* pointer to registers */
struct pci_dev *pdev; /* PCI device */
/* IRQ stuff */
int dual_irq; /* set if separate IRQs are used */
OpenPOWER on IntegriCloud