From 4fe1cd0b5e12a3c61f908600151ea48a1134945c Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Thu, 1 Mar 2012 15:19:15 -0800 Subject: [PATCH] --- yaml --- r: 295919 b: refs/heads/master c: dc0caefdf48713fce373c8663e5a0d292a424746 h: refs/heads/master i: 295917: 138e34256339a7049b000e6f35d9dbfbf4d6460e 295915: ac4c19f53b15ab760c13be49c953b6a488b2e1ed 295911: 74677e3365b76ff0629dfef802464c855b6f6e01 295903: a0ad6455c855d12264639385cc1c8239cb826e2d v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/board-ams-delta.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6922ed6e86a1..c00ff16f8c1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42392762149cba0a74c1c5b1b1bb868d86e62383 +refs/heads/master: dc0caefdf48713fce373c8663e5a0d292a424746 diff --git a/trunk/arch/arm/mach-omap1/board-ams-delta.c b/trunk/arch/arm/mach-omap1/board-ams-delta.c index 87b13039f936..3c97e6400546 100644 --- a/trunk/arch/arm/mach-omap1/board-ams-delta.c +++ b/trunk/arch/arm/mach-omap1/board-ams-delta.c @@ -154,7 +154,7 @@ static struct omap_lcd_config ams_delta_lcd_config = { .ctrl_name = "internal", }; -static struct omap_usb_config ams_delta_usb_config __initdata = { +static struct omap_usb_config ams_delta_usb_config = { .register_host = 1, .hmc_mode = 16, .pins[0] = 2, @@ -300,7 +300,7 @@ static const struct matrix_keymap_data ams_delta_keymap_data = { .keymap_size = ARRAY_SIZE(ams_delta_keymap), }; -static struct omap_kp_platform_data ams_delta_kp_data __initdata = { +static struct omap_kp_platform_data ams_delta_kp_data = { .rows = 8, .cols = 8, .keymap_data = &ams_delta_keymap_data,