diff options
author | Tony Lindgren <tony@atomide.com> | 2010-09-27 13:17:13 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-09-27 13:17:13 -0700 |
commit | 91f6c90c8df1818a66d177e105d602c3da820919 (patch) | |
tree | 5cb1b01823dd676a07596f6153d2fc124c4691cb /arch/arm/plat-omap/include/plat/common.h | |
parent | 6e457bb05c348e196f67005876992ceb5eb0430a (diff) | |
parent | a3fed9bc181666df6ecfe9ce34a29d48803f2310 (diff) |
Merge branch 'omap4_and_sdrc_2.6.27' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/include/plat/common.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index c45dbb975e0..2d8f98d7ae5 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h @@ -47,6 +47,7 @@ struct omap_globals { unsigned long sdrc; /* SDRAM Controller */ unsigned long sms; /* SDRAM Memory Scheduler */ unsigned long ctrl; /* System Control Module */ + unsigned long ctrl_pad; /* PAD Control Module */ unsigned long prm; /* Power and Reset Management */ unsigned long cm; /* Clock Management */ unsigned long cm2; |