diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:13:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:13:26 -0400 |
| commit | d3b8a1a8496c83bc4a3cc76505c29255af15572c (patch) | |
| tree | b56eb3ef27117bad5c516d6b647bdcd465d7659a /arch/arm | |
| parent | 60564a313a5738960064d6c555ec066d9332f278 (diff) | |
| parent | 0ed0c0c48c508578c30aa58f755ca0d692636906 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap/usb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap/usb.c b/arch/arm/mach-omap/usb.c index 6e805d451d0e..7f37857b1a28 100644 --- a/arch/arm/mach-omap/usb.c +++ b/arch/arm/mach-omap/usb.c | |||
| @@ -288,8 +288,8 @@ static void usb_release(struct device *dev) | |||
| 288 | static struct resource udc_resources[] = { | 288 | static struct resource udc_resources[] = { |
| 289 | /* order is significant! */ | 289 | /* order is significant! */ |
| 290 | { /* registers */ | 290 | { /* registers */ |
| 291 | .start = IO_ADDRESS(UDC_BASE), | 291 | .start = UDC_BASE, |
| 292 | .end = IO_ADDRESS(UDC_BASE + 0xff), | 292 | .end = UDC_BASE + 0xff, |
| 293 | .flags = IORESOURCE_MEM, | 293 | .flags = IORESOURCE_MEM, |
| 294 | }, { /* general IRQ */ | 294 | }, { /* general IRQ */ |
| 295 | .start = IH2_BASE + 20, | 295 | .start = IH2_BASE + 20, |
| @@ -355,8 +355,8 @@ static struct platform_device ohci_device = { | |||
| 355 | static struct resource otg_resources[] = { | 355 | static struct resource otg_resources[] = { |
| 356 | /* order is significant! */ | 356 | /* order is significant! */ |
| 357 | { | 357 | { |
| 358 | .start = IO_ADDRESS(OTG_BASE), | 358 | .start = OTG_BASE, |
| 359 | .end = IO_ADDRESS(OTG_BASE + 0xff), | 359 | .end = OTG_BASE + 0xff, |
| 360 | .flags = IORESOURCE_MEM, | 360 | .flags = IORESOURCE_MEM, |
| 361 | }, { | 361 | }, { |
| 362 | .start = IH2_BASE + 8, | 362 | .start = IH2_BASE + 8, |