diff options
Diffstat (limited to 'drivers/staging/msm/staging-devices.c')
| -rw-r--r-- | drivers/staging/msm/staging-devices.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/msm/staging-devices.c b/drivers/staging/msm/staging-devices.c index 0f8ec3e26013..d6cd919469dd 100644 --- a/drivers/staging/msm/staging-devices.c +++ b/drivers/staging/msm/staging-devices.c @@ -18,7 +18,6 @@ #include "msm_mdp.h" #include "memory_ll.h" //#include "android_pmem.h" -#include <mach/board.h> #ifdef CONFIG_MSM_SOC_REV_A #define MSM_SMI_BASE 0xE0000000 @@ -115,17 +114,7 @@ static int msm_fb_detect_panel(const char *name) } else if ((machine_is_qsd8x50_surf() || machine_is_qsd8x50a_surf()) && !strcmp(name, "lcdc_external")) ret = 0; - else if (0 /*machine_is_qsd8x50_grapefruit() */) { - if (!strcmp(name, "lcdc_grapefruit_vga")) - ret = 0; - else - ret = -ENODEV; - } else if (machine_is_qsd8x50_st1()) { - if (!strcmp(name, "lcdc_st1_wxga")) - ret = 0; - else - ret = -ENODEV; - } else if (machine_is_qsd8x50a_st1_5()) { + else if (machine_is_qsd8x50a_st1_5()) { if (!strcmp(name, "lcdc_st15") || !strcmp(name, "hdmi_sii9022")) ret = 0; @@ -177,7 +166,7 @@ static void __init qsd8x50_allocate_memory_regions(void) msm_fb_resources[0].start = __pa(addr); msm_fb_resources[0].end = msm_fb_resources[0].start + size - 1; - pr_info(KERN_ERR "using %lu bytes of SMI at %lx physical for fb\n", + pr_info("using %lu bytes of SMI at %lx physical for fb\n", size, (unsigned long)addr); } |