From c67a3b147d62ccd4d6001d3b0dcfdf6ef98b32a5 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Sun, 16 Dec 2012 11:30:02 -0800 Subject: [PATCH] --- yaml --- r: 348055 b: refs/heads/master c: 7eae44fa67b9203d7c5a2fa297050185598c9711 h: refs/heads/master i: 348053: d6100f7a30f717463526e818bab60e9d0b8a4a65 348051: 21be4f192a84944cc5bc557415d3e4072d80902e 348047: 0b90eda01c90c9dcbcfab7bc599fec6a94aa0d12 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/control.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a79dcdec7d50..1e4eb2d73d88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4e9f7ea2ee83c21b9541a7624deb1ed361d1b39 +refs/heads/master: 7eae44fa67b9203d7c5a2fa297050185598c9711 diff --git a/trunk/arch/arm/mach-omap2/control.h b/trunk/arch/arm/mach-omap2/control.h index 3d944d3263d2..e6c328128a0a 100644 --- a/trunk/arch/arm/mach-omap2/control.h +++ b/trunk/arch/arm/mach-omap2/control.h @@ -234,7 +234,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)