* YOSHIFUJI Hideaki <yoshfuji@xxxxxxxxxxxxxx> [121102 07:57]: > Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@xxxxxxxxxxxxxx> > --- > arch/arm/mach-omap2/control.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h > index a89e825..5e6886e 100644 > --- a/arch/arm/mach-omap2/control.h > +++ b/arch/arm/mach-omap2/control.h > @@ -233,7 +233,7 @@ > #define OMAP343X_PADCONF_ETK_D14 OMAP343X_PADCONF_ETK(16) > #define OMAP343X_PADCONF_ETK_D15 OMAP343X_PADCONF_ETK(17) > > -/* 34xx GENERAL_WKUP regist offsets */ > +/* 34xx GENERAL_WKUP register offsets */ > #define OMAP343X_CONTROL_WKUP_DEBOBSMUX(i) (OMAP343X_CONTROL_GENERAL_WKUP + \ > 0x008 + (i)) > #define OMAP343X_CONTROL_WKUP_DEBOBS0 (OMAP343X_CONTROL_GENERAL_WKUP + 0x008) Thanks applying into omap-for-v3.8/fixes-for-merge-window with the subject line also as the description. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html