diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 08:50:26 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 08:50:38 -0400 |
| commit | 50ee9339c7347c2b16fa79d43777f72e9f41ef5a (patch) | |
| tree | ce09aa147e5c8bb74c72c46cebfdbffeece6678f /arch/arm/plat-samsung | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) | |
| parent | 98346f7db014614a4814eb60639f651f8bbc591d (diff) | |
Merge 2.6.39-rc4 into usb-next
This is needed to help resolve some xhci issues and other minor
differences.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index f0da6b70fba4..3f38debbb108 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
| @@ -142,6 +142,8 @@ extern struct platform_device s5p_device_fimc3; | |||
| 142 | extern struct platform_device s5p_device_mipi_csis0; | 142 | extern struct platform_device s5p_device_mipi_csis0; |
| 143 | extern struct platform_device s5p_device_mipi_csis1; | 143 | extern struct platform_device s5p_device_mipi_csis1; |
| 144 | 144 | ||
| 145 | extern struct platform_device s5p_device_ehci; | ||
| 146 | |||
| 145 | extern struct platform_device exynos4_device_sysmmu; | 147 | extern struct platform_device exynos4_device_sysmmu; |
| 146 | 148 | ||
| 147 | /* s3c2440 specific devices */ | 149 | /* s3c2440 specific devices */ |