fix warning: Found section mismatch; fix unable to boot up kernel bug

diff --git a/arch/arm/mach-rk2818/board-midsdk.c b/arch/arm/mach-rk2818/board-midsdk.c
index 9d3ee96a4f92ba7472cb0c3facc7c28a42090755..91c7fd467acccad179efb0e9bc87fc898aa309b1 100644 (file)
--- a/arch/arm/mach-rk2818/board-midsdk.c
+++ b/arch/arm/mach-rk2818/board-midsdk.c
@@ -165,7 +165,7 @@ void rk2818_sdmmc1_cfg_gpio(struct platform_device *dev)
 }
 #define CONFIG_SDMMC0_USE_DMA
 #define CONFIG_SDMMC1_USE_DMA
-struct rk2818_sdmmc_platform_data default_sdmmc0_data __initdata = {
+struct rk2818_sdmmc_platform_data default_sdmmc0_data = {
        .host_ocr_avail = (MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
                                           MMC_VDD_30_31|MMC_VDD_31_32|MMC_VDD_32_33| 
                                           MMC_VDD_33_34|MMC_VDD_34_35| MMC_VDD_35_36),
@@ -179,7 +179,7 @@ struct rk2818_sdmmc_platform_data default_sdmmc0_data __initdata = {
        .use_dma = 0,
 #endif
 };
-struct rk2818_sdmmc_platform_data default_sdmmc1_data __initdata = {
+struct rk2818_sdmmc_platform_data default_sdmmc1_data = {
        .host_ocr_avail = (MMC_VDD_26_27|MMC_VDD_27_28|MMC_VDD_28_29|
                                           MMC_VDD_29_30|MMC_VDD_30_31|MMC_VDD_31_32|
                                           MMC_VDD_32_33|MMC_VDD_33_34),
@@ -258,14 +258,14 @@ void rk2818_i2c1_cfg_gpio(struct platform_device *dev)
 {
        rk2818_mux_api_set(GPIOE_U1IR_I2C1_NAME, IOMUXA_I2C1);
 }
-struct rk2818_i2c_platform_data default_i2c0_data __initdata = { 
+struct rk2818_i2c_platform_data default_i2c0_data = { 
        .bus_num    = 0,
        .flags      = 0,
        .slave_addr = 0xff,
        .scl_rate  = 400*1000,
        .cfg_gpio = rk2818_i2c0_cfg_gpio,
 };
-struct rk2818_i2c_platform_data default_i2c1_data __initdata = { 
+struct rk2818_i2c_platform_data default_i2c1_data = { 
 #ifdef CONFIG_I2C0_RK2818
        .bus_num    = 1,
 #else
@@ -400,14 +400,18 @@ static struct platform_device *devices[] __initdata = {
        &rk2818_device_sdmmc1,
 #endif
        &rk2818_device_spim,
+#if defined(CONFIG_ANDROID_PMEM)
        &rk2818_device_pmem,
+#endif
        &rk2818_device_adc,
        &rk2818_device_adckey,
        &rk2818_device_battery,
     &rk2818_device_fb,    
     &rk2818_device_backlight,
        &rk2818_device_dsp,
+#ifdef CONFIG_MTD_NAND_RK2818
        &rk2818_nand_device,
+#endif
 };
 
 extern struct sys_timer rk2818_timer;

diff --git a/arch/arm/mach-rk2818/iomux.c b/arch/arm/mach-rk2818/iomux.c
index dfa5022c7c4650429752ddf523f56c1b413addcf..bcd062ebcb7f089c74650a8b73579e944bc76ec8 100644 (file)
--- a/arch/arm/mach-rk2818/iomux.c
+++ b/arch/arm/mach-rk2818/iomux.c
@@ -27,7 +27,7 @@
 #define RK2818_IOMUX_A_CON    (RK2818_REGFILE_BASE + IOMUX_A_CON)
 #define RK2818_IOMUX_B_CON    (RK2818_REGFILE_BASE + IOMUX_B_CON)
 
-static struct mux_config __initdata_or_module rk2818_muxs[] = {
+static struct mux_config rk2818_muxs[] = {
 /*
  *      description                            mux  mode   mux   mux  
  *                                             reg  offset inter mode