From a2ad53fbba35e118e2e524b64466c2be6e94da43 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 17 Dec 2007 20:55:55 -0800 Subject: [PATCH] ARM: OMAP1: Misc clean-up to sync up with mainline Remove board-generic MMC configuration as it's unknown. Clean-up pm.c. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-generic.c | 18 ------------------ arch/arm/mach-omap1/pm.c | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index 54a430fd90d..c711bf23f7b 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -57,30 +57,12 @@ static struct omap_usb_config generic1610_usb_config __initdata = { }; #endif -static struct omap_mmc_config generic_mmc_config __initdata = { - .mmc [0] = { - .enabled = 0, - .wire4 = 0, - .wp_pin = -1, - .power_pin = -1, - .switch_pin = -1, - }, - .mmc [1] = { - .enabled = 0, - .wire4 = 0, - .wp_pin = -1, - .power_pin = -1, - .switch_pin = -1, - }, -}; - static struct omap_uart_config generic_uart_config __initdata = { .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), }; static struct omap_board_config_kernel generic_config[] __initdata = { { OMAP_TAG_USB, NULL }, - { OMAP_TAG_MMC, &generic_mmc_config }, { OMAP_TAG_UART, &generic_uart_config }, }; diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index c5a89cde415..4da18b869d6 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -100,7 +100,7 @@ static struct subsys_attribute sleep_while_idle_attr = { #endif -static void (*omap_sram_idle)(void) = NULL; +extern struct kset power_subsys; static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL; /* -- 2.41.1