Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
[linux-2.6.git] / arch / sh / boards / mach-ap325rxa / setup.c
index 7977911..6418e95 100644 (file)
@@ -249,9 +249,6 @@ static struct platform_device lcdc_device = {
        .dev            = {
                .platform_data  = &lcdc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_LCDC,
-       },
 };
 
 static void camera_power(int val)
@@ -424,9 +421,6 @@ static struct platform_device ceu_device = {
        .dev            = {
                .platform_data  = &sh_mobile_ceu_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU,
-       },
 };
 
 static struct resource sdhi0_cn3_resources[] = {
@@ -454,9 +448,6 @@ static struct platform_device sdhi0_cn3_device = {
        .dev = {
                .platform_data = &sdhi0_cn3_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI0,
-       },
 };
 
 static struct resource sdhi1_cn7_resources[] = {
@@ -484,9 +475,6 @@ static struct platform_device sdhi1_cn7_device = {
        .dev = {
                .platform_data = &sdhi1_cn7_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI1,
-       },
 };
 
 static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {