diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
| tree | a6063f77bd719d933823915d2273eaadb6331611 /drivers/usb/gadget/pxa27x_udc.h | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
| parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 (diff) | |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
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) | |||
| 484 | #define ep_warn(ep, fmt, arg...) \ | 484 | #define ep_warn(ep, fmt, arg...) \ |
| 485 | dev_warn(ep->dev->dev, "%s:%s:" fmt, EPNAME(ep), __func__, ## arg) | 485 | dev_warn(ep->dev->dev, "%s:%s:" fmt, EPNAME(ep), __func__, ## arg) |
| 486 | 486 | ||
| 487 | /* | ||
| 488 | * Cannot include pxa-regs.h, as register names are similar. | ||
| 489 | * So PSSR is redefined here. This should be removed once UDC registers will | ||
| 490 | * be gone from pxa-regs.h. | ||
| 491 | */ | ||
| 492 | #define PSSR __REG(0x40F00004) /* Power Manager Sleep Status */ | ||
| 493 | #define PSSR_OTGPH (1 << 6) /* OTG Peripheral Hold */ | ||
| 494 | |||
| 495 | #endif /* __LINUX_USB_GADGET_PXA27X_H */ | 487 | #endif /* __LINUX_USB_GADGET_PXA27X_H */ |