Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 348055
b: refs/heads/master
c: 7eae44f
h: refs/heads/master
i:
  348053: d6100f7
  348051: 21be4f1
  348047: 0b90eda
v: v3
  • Loading branch information
YOSHIFUJI Hideaki authored and Tony Lindgren committed Dec 17, 2012
1 parent 9591ee1 commit c67a3b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e4e9f7ea2ee83c21b9541a7624deb1ed361d1b39
refs/heads/master: 7eae44fa67b9203d7c5a2fa297050185598c9711
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/control.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c67a3b1

Please sign in to comment.