---

yaml --- r: 295919 b: refs/heads/master c: dc0caef h: refs/heads/master i: 295917: 138e342 295915: ac4c19f 295911: 74677e3 295903: a0ad645 v: v3
git-mirror · Mar 1, 2012 · 4fe1cd0 · 4fe1cd0
1 parent 5446af5
commit 4fe1cd0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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,