diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 18:36:09 +0900 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 18:36:09 +0900 |
commit | 668dfc7527eb755e1bf194bf19c0c281e9df6deb (patch) | |
tree | 2d9ba8e3ebbb7579f1af0493a9783f640ca86546 /arch/arm/mach-s3c2410/usb-simtec.c | |
parent | 9e157144afe81052f5abe122c2469e33a30d20a5 (diff) | |
parent | 22c810ab3e25d16e6f128384d107b933b6fd8fff (diff) |
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try7
Diffstat (limited to 'arch/arm/mach-s3c2410/usb-simtec.c')
-rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index 6b9d0d83a6f9..29bd3d987bec 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c @@ -91,7 +91,7 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on) } } -static struct s3c2410_hcd_info usb_simtec_info = { +static struct s3c2410_hcd_info usb_simtec_info __initdata = { .port[0] = { .flags = S3C_HCDFLG_USED }, @@ -127,6 +127,6 @@ int usb_simtec_init(void) gpio_direction_output(S3C2410_GPB(4), 1); gpio_direction_input(S3C2410_GPG(10)); - s3c_device_usb.dev.platform_data = &usb_simtec_info; + s3c_ohci_set_platdata(&usb_simtec_info); return 0; } |