2 files changed, 2 insertions, 11 deletions

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index ad519390dd58..48c8c9195dc3 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -326,7 +326,7 @@ static struct omap_lcd_config h2_lcd_config __initdata = {
         .ctrl_name      = "internal",
 };
 
-static struct omap_board_config_kernel h2_config[] = {
+static struct omap_board_config_kernel h2_config[] __initdata = {
         { OMAP_TAG_USB,           &h2_usb_config },
         { OMAP_TAG_MMC,           &h2_mmc_config },
         { OMAP_TAG_UART,        &h2_uart_config },
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 6f4ea4bda5e0..8caee68aa090 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -1,4 +1,3 @@
-//kernel/linux-omap-fsample/arch/arm/mach-omap1/pm.c#3 - integrate change 4545 (text)
 /*
  * linux/arch/arm/mach-omap1/pm.c
  *
@@ -377,7 +376,7 @@ void omap_pm_suspend(void)
          * Jump to assembly code. The processor will stay there
          * until wake up.
          */
-        omap_sram_suspend(arg0, arg1);
+        omap_sram_suspend(arg0, arg1);
 
         /*
          * If we are here, processor is woken up!
@@ -631,10 +630,6 @@ static int omap_pm_prepare(suspend_state_t state)
         case PM_SUSPEND_STANDBY:
         case PM_SUSPEND_MEM:
                 break;
-
-        case PM_SUSPEND_DISK:
-                return -ENOTSUPP;
-
         default:
                 return -EINVAL;
         }
@@ -657,10 +652,6 @@ static int omap_pm_enter(suspend_state_t state)
         case PM_SUSPEND_MEM:
                 omap_pm_suspend();
                 break;
-
-        case PM_SUSPEND_DISK:
-                return -ENOTSUPP;
-
         default:
                 return -EINVAL;
         }