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/plat-s3c | |
| parent | 9e157144afe81052f5abe122c2469e33a30d20a5 (diff) | |
| parent | 22c810ab3e25d16e6f128384d107b933b6fd8fff (diff) | |
| download | linux-stable-668dfc7527eb755e1bf194bf19c0c281e9df6deb.tar.gz linux-stable-668dfc7527eb755e1bf194bf19c0c281e9df6deb.tar.bz2 linux-stable-668dfc7527eb755e1bf194bf19c0c281e9df6deb.zip | |
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try7
Diffstat (limited to 'arch/arm/plat-s3c')
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/devs.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/usb-control.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h index f4a7e57bab2b..c6f9b7310490 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h @@ -37,7 +37,7 @@ extern struct platform_device s3c64xx_device_pcm1; extern struct platform_device s3c_device_ts; extern struct platform_device s3c_device_fb; -extern struct platform_device s3c_device_usb; +extern struct platform_device s3c_device_ohci; extern struct platform_device s3c_device_lcd; extern struct platform_device s3c_device_wdt; extern struct platform_device s3c_device_i2c0; diff --git a/arch/arm/plat-s3c/include/plat/usb-control.h b/arch/arm/plat-s3c/include/plat/usb-control.h index 822c87fe948e..a6a57bf796bd 100644 --- a/arch/arm/plat-s3c/include/plat/usb-control.h +++ b/arch/arm/plat-s3c/include/plat/usb-control.h @@ -38,4 +38,6 @@ static void inline s3c2410_usb_report_oc(struct s3c2410_hcd_info *info, int port } } +extern void s3c_ohci_set_platdata(struct s3c2410_hcd_info *info); + #endif /*__ASM_ARCH_USBCONTROL_H */ |