diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-06-06 19:40:47 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-06-15 20:54:23 +0200 |
| commit | d438ae5796085379327bdba76114929eedf94a89 (patch) | |
| tree | 412caa9e4a7eebd2b75f26e51d661bcfeb77c9ff /drivers/usb/gadget/pxa27x_udc.h | |
| parent | [ARM] 5071/2: Drop PXA_SHARPSL_25x/27x case from PXA Kconfig. (diff) | |
| download | linux-d438ae5796085379327bdba76114929eedf94a89.tar.xz linux-d438ae5796085379327bdba76114929eedf94a89.zip | |
[ARM] 5080/1: touch PSSR_OTGPH only on pxa27x in ohci-pxa27x and pxa27x_udc
and include pxa2xx-regs.h as build fix since PSSR definitions
moved from pxa-regs.h into pxa2xx-regs.h.
Note: This change is temporary as pxa27x processor specific
code will be finally moved elsewhere (both drivers should
support pxa3xx, too).
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/usb/gadget/pxa27x_udc.h')
| -rw-r--r-- | drivers/usb/gadget/pxa27x_udc.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.h b/drivers/usb/gadget/pxa27x_udc.h index 97453db924ff..1d1b7936ee11 100644 --- a/drivers/usb/gadget/pxa27x_udc.h +++ b/drivers/usb/gadget/pxa27x_udc.h @@ -484,12 +484,4 @@ static inline struct pxa_udc *to_gadget_udc(struct usb_gadget *gadget) #define ep_warn(ep, fmt, arg...) \ dev_warn(ep->dev->dev, "%s:%s:" fmt, EPNAME(ep), __func__, ## arg) -/* - * Cannot include pxa-regs.h, as register names are similar. - * So PSSR is redefined here. This should be removed once UDC registers will - * be gone from pxa-regs.h. - */ -#define PSSR __REG(0x40F00004) /* Power Manager Sleep Status */ -#define PSSR_OTGPH (1 << 6) /* OTG Peripheral Hold */ - #endif /* __LINUX_USB_GADGET_PXA27X_H */ |