diff --git a/[refs] b/[refs] index 55d6e5413011..22ae68c56721 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49b26e0dfdaea23bdae182110c58d63d566b288a +refs/heads/master: 460709a6f12cced5c7a7e675521812e63ba1e1be diff --git a/trunk/arch/arm/mach-msm/io.c b/trunk/arch/arm/mach-msm/io.c index a1e7b1168850..2409c0b299f0 100644 --- a/trunk/arch/arm/mach-msm/io.c +++ b/trunk/arch/arm/mach-msm/io.c @@ -50,9 +50,6 @@ static struct map_desc msm_io_desc[] __initdata = { #if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ defined(CONFIG_DEBUG_MSM_UART3) MSM_DEVICE(DEBUG_UART), -#endif -#ifdef CONFIG_ARCH_MSM7X30 - MSM_DEVICE(GCC), #endif { .virtual = (unsigned long) MSM_SHARED_RAM_BASE,