Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...

[~andy/linux] / arch / arm / mach-omap2 / board-rx51.c

diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 74c8aadc0a19927f0de86247c544658a84a192a5..4af7c4b2881ae19793d29c4c68ad65f50330210d 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -79,29 +79,6 @@ static struct cpuidle_params rx51_cpuidle_params[] = {
        {7505 + 15274, 484329, 1},
 };
 
-static struct omap_lcd_config rx51_lcd_config = {
-       .ctrl_name      = "internal",
-};
-
-static struct omap_fbmem_config rx51_fbmem0_config = {
-       .size = 752 * 1024,
-};
-
-static struct omap_fbmem_config rx51_fbmem1_config = {
-       .size = 752 * 1024,
-};
-
-static struct omap_fbmem_config rx51_fbmem2_config = {
-       .size = 752 * 1024,
-};
-
-static struct omap_board_config_kernel rx51_config[] = {
-       { OMAP_TAG_FBMEM,       &rx51_fbmem0_config },
-       { OMAP_TAG_FBMEM,       &rx51_fbmem1_config },
-       { OMAP_TAG_FBMEM,       &rx51_fbmem2_config },
-       { OMAP_TAG_LCD,         &rx51_lcd_config },
-};
-
 extern void __init rx51_peripherals_init(void);
 
 #ifdef CONFIG_OMAP_MUX
@@ -121,8 +98,6 @@ static void __init rx51_init(void)
        struct omap_sdrc_params *sdrc_params;
 
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
-       omap_board_config = rx51_config;
-       omap_board_config_size = ARRAY_SIZE(rx51_config);
        omap3_pm_init_cpuidle(rx51_cpuidle_params);
        omap_serial_init();