Merge branch '7xx-iosplit-plat' with omap-fixes

[linux-beck.git] / arch / arm / plat-omap / include / plat / keypad.h

diff --git a/arch/arm/plat-omap/include/mach/keypad.h b/arch/arm/plat-omap/include/plat/keypad.h
similarity index 100%
rename from arch/arm/plat-omap/include/mach/keypad.h
rename to arch/arm/plat-omap/include/plat/keypad.h