diff --git a/[refs] b/[refs] index 989f7c33c545..32de51fee095 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afc12d30a74415a49a6ce36d89f82641b46c499b +refs/heads/master: fb136e97840872638cb08588c4c9b9fff7f7c456 diff --git a/trunk/include/linux/ioc4.h b/trunk/include/linux/ioc4.h index de73a3289cc2..51e2b9fb6372 100644 --- a/trunk/include/linux/ioc4.h +++ b/trunk/include/linux/ioc4.h @@ -157,7 +157,7 @@ struct ioc4_driver_data { unsigned long idd_bar0; struct pci_dev *idd_pdev; const struct pci_device_id *idd_pci_id; - struct __iomem ioc4_misc_regs *idd_misc_regs; + struct ioc4_misc_regs __iomem *idd_misc_regs; unsigned long count_period; void *idd_serial_data; unsigned int idd_variant;