diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
commit | ca8cdf043c7c6d8e1b4b3d86f3cae12fc37756a2 (patch) | |
tree | dad605a1b3142e85d9ddc08a77d62f6bf09f22cc /arch/arm/plat-s3c/dev-usb.c | |
parent | 16696dd08020690cff796fc4705b4d6bd14e91b0 (diff) | |
parent | b4136a36f31a65d0998a328465df9e8e2ba93166 (diff) |
Merge branch 'andy-tracking' into drm-tracking
Conflicts:
drivers/mfd/glamo/Kconfig
Diffstat (limited to 'arch/arm/plat-s3c/dev-usb.c')
-rw-r--r-- | arch/arm/plat-s3c/dev-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/dev-usb.c b/arch/arm/plat-s3c/dev-usb.c index 2ee85abed6d..721ff18f438 100644 --- a/arch/arm/plat-s3c/dev-usb.c +++ b/arch/arm/plat-s3c/dev-usb.c @@ -37,7 +37,7 @@ static struct resource s3c_usb_resource[] = { static u64 s3c_device_usb_dmamask = 0xffffffffUL; struct platform_device s3c_device_usb = { - .name = "s3c2410-ohci", + .name = "s3c-ohci", .id = -1, .num_resources = ARRAY_SIZE(s3c_usb_resource), .resource = s3c_usb_resource, |