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 /arch/arm/mach-ixp4xx/common.c | |
| 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 'arch/arm/mach-ixp4xx/common.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index f6d66dce6852..3781b3db9f49 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
| @@ -326,11 +326,11 @@ static struct resource ixp4xx_udc_resources[] = { | |||
| 326 | }; | 326 | }; |
| 327 | 327 | ||
| 328 | /* | 328 | /* |
| 329 | * USB device controller. The IXP4xx uses the same controller as PXA2XX, | 329 | * USB device controller. The IXP4xx uses the same controller as PXA25X, |
| 330 | * so we just use the same device. | 330 | * so we just use the same device. |
| 331 | */ | 331 | */ |
| 332 | static struct platform_device ixp4xx_udc_device = { | 332 | static struct platform_device ixp4xx_udc_device = { |
| 333 | .name = "pxa2xx-udc", | 333 | .name = "pxa25x-udc", |
| 334 | .id = -1, | 334 | .id = -1, |
| 335 | .num_resources = 2, | 335 | .num_resources = 2, |
| 336 | .resource = ixp4xx_udc_resources, | 336 | .resource = ixp4xx_udc_resources, |