diff --git a/[refs] b/[refs] index 6cb955c7ea94..5928377be9d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f36e231e9dbffb5264612e5b5817ab574a5e5db +refs/heads/master: f8c1376c2202c9158ab908d730524a590bafdcb8 diff --git a/trunk/drivers/usb/chipidea/ci.h b/trunk/drivers/usb/chipidea/ci.h index 56cb73b1e903..0f226b0d4761 100644 --- a/trunk/drivers/usb/chipidea/ci.h +++ b/trunk/drivers/usb/chipidea/ci.h @@ -80,7 +80,6 @@ struct hw_bank { /* CI13XXX UDC descriptor & global resources */ struct ci13xxx { spinlock_t lock; /* ctrl register bank access */ - void __iomem *regs; /* registers address space */ struct dma_pool *qh_pool; /* DMA pool for queue heads */ struct dma_pool *td_pool; /* DMA pool for transfer descs */ diff --git a/trunk/drivers/usb/chipidea/ci13xxx_msm.c b/trunk/drivers/usb/chipidea/ci13xxx_msm.c index 9b09f0cd3d5a..958069ef95e3 100644 --- a/trunk/drivers/usb/chipidea/ci13xxx_msm.c +++ b/trunk/drivers/usb/chipidea/ci13xxx_msm.c @@ -15,7 +15,7 @@ #include "ci.h" -#define MSM_USB_BASE (udc->regs) +#define MSM_USB_BASE (udc->hw_bank.abs) static void ci13xxx_msm_notify_event(struct ci13xxx *udc, unsigned event) {