Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

[karo-tx-linux.git] / arch / sh / boards / mach-kfr2r09 / setup.c

diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 208c9b0402637010cf1fdc7c0d84f31494d9b955..2a18b06abdafcd8220cfc99c03fac52e98ca2efd 100644 (file)
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -122,9 +122,6 @@ static struct platform_device kfr2r09_sh_keysc_device = {
        .dev    = {
                .platform_data  = &kfr2r09_sh_keysc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_KEYSC,
-       },
 };
 
 static const struct fb_videomode kfr2r09_lcdc_modes[] = {
@@ -191,9 +188,6 @@ static struct platform_device kfr2r09_sh_lcdc_device = {
        .dev    = {
                .platform_data  = &kfr2r09_sh_lcdc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_LCDC,
-       },
 };
 
 static struct r8a66597_platdata kfr2r09_usb0_gadget_data = {
@@ -254,9 +248,6 @@ static struct platform_device kfr2r09_ceu_device = {
        .dev    = {
                .platform_data  = &sh_mobile_ceu_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU0,
-       },
 };
 
 static struct i2c_board_info kfr2r09_i2c_camera = {
@@ -377,9 +368,6 @@ static struct platform_device kfr2r09_sh_sdhi0_device = {
        .dev = {
                .platform_data  = &sh7724_sdhi0_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI0,
-       },
 };
 
 static struct platform_device *kfr2r09_devices[] __initdata = {