Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfb0ae09 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

parents 1da78078 dfa3d039

arch/arm/mach-omap1/board-palmte.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static const int palmte_keymap[] = { 
	KEY(1, 1, KEY_DOWN),

	KEY(1, 2, KEY_UP),

	KEY(1, 3, KEY_RIGHT),

	KEY(1, 4, KEY_CENTER),

	KEY(1, 4, KEY_ENTER),

	0,

};

arch/arm/mach-omap1/board-palmz71.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int palmz71_keymap[] = { 
	KEY(1, 1, KEY_DOWN),

	KEY(1, 2, KEY_UP),

	KEY(1, 3, KEY_RIGHT),

	KEY(1, 4, KEY_CENTER),

	KEY(1, 4, KEY_ENTER),

	KEY(2, 0, KEY_CAMERA),

	0,

};

arch/arm/mach-omap2/board-2430sdp.c

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ static void __init omap_2430sdp_init(void) 


static void __init omap_2430sdp_map_io(void)

{

	omap2_set_globals_243x();

	omap2_map_common_io();

}

arch/arm/mach-omap2/board-apollon.c

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ static void __init omap_apollon_init(void) 


static void __init omap_apollon_map_io(void)

{

	omap2_set_globals_242x();

	omap2_map_common_io();

}

arch/arm/mach-omap2/board-generic.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static void __init omap_generic_init(void) 


static void __init omap_generic_map_io(void)

{

	omap2_set_globals_242x(); /* should be 242x, 243x, or 343x */

	omap2_map_common_io();

}