aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuisung.kang <hs1218.kang@samsung.com>2010-10-23 07:11:22 +0200
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:51:33 -0800
commit1b035c0934d9ae2cc6a4ba35ad3a1b2f8a837258 (patch)
tree08808e5f3f5ac106583166bda8ec995598196e6b
parentdd2943a159f57eafa7a069b2961e97456be439e9 (diff)
downloadkernel_samsung_crespo-1b035c0934d9ae2cc6a4ba35ad3a1b2f8a837258.zip
kernel_samsung_crespo-1b035c0934d9ae2cc6a4ba35ad3a1b2f8a837258.tar.gz
kernel_samsung_crespo-1b035c0934d9ae2cc6a4ba35ad3a1b2f8a837258.tar.bz2
S5PC11X: herring: Modify GPU platform devices
Change-Id: I214f6f8fd75c30e2fafc197a74e9e5a30aa2a1ab Signed-off-by: huisung.kang <hs1218.kang@samsung.com>
-rw-r--r--arch/arm/mach-s5pv210/mach-herring.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c
index 2c1b0b8..f1d05e8 100644
--- a/arch/arm/mach-s5pv210/mach-herring.c
+++ b/arch/arm/mach-s5pv210/mach-herring.c
@@ -3926,20 +3926,6 @@ static struct platform_device sec_device_wifi = {
},
};
-static struct platform_device herring_pvr_device = {
- .name = "pvrsrvkm",
- .id = -1,
-};
-static struct platform_device herring_lcd_device = {
- .name = "s3c_lcd",
- .id = -1,
-};
-static void __init herring_pvr_init(void)
-{
- platform_device_register(&herring_pvr_device);
- platform_device_register(&herring_lcd_device);
-}
-
static struct platform_device *herring_devices[] __initdata = {
#ifdef CONFIG_FIQ_DEBUGGER
&s5pv210_device_fiqdbg_uart2,
@@ -3973,6 +3959,9 @@ static struct platform_device *herring_devices[] __initdata = {
&s3c_device_jpeg,
#endif
+ &s3c_device_g3d,
+ &s3c_device_lcd,
+
#ifdef CONFIG_FB_S3C_TL2796
&s3c_device_spi_gpio,
#endif
@@ -4323,8 +4312,6 @@ static void __init herring_machine_init(void)
uart_switch_init();
herring_init_wifi_mem();
-
- herring_pvr_init();
}
#ifdef CONFIG_USB_SUPPORT