diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-10 21:54:14 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-10 21:54:14 -0500 |
| commit | 94a06b74e724caabcf0464c81527cfbcae0c8aff (patch) | |
| tree | 3570b6a627382a5eb5c8328b4959f615544d8e62 /arch/arm/plat-omap/include/plat/common.h | |
| parent | 0dde52a9f5330eec240660191a94b51bd911ffcd (diff) | |
| parent | 9062511097683b4422f023d181b4a8b2db1a7a72 (diff) | |
Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm 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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index 1dd97e7461c9..5288130be96e 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h | |||
| @@ -56,10 +56,6 @@ struct omap_globals { | |||
| 56 | unsigned long prm; /* Power and Reset Management */ | 56 | unsigned long prm; /* Power and Reset Management */ |
| 57 | unsigned long cm; /* Clock Management */ | 57 | unsigned long cm; /* Clock Management */ |
| 58 | unsigned long cm2; | 58 | unsigned long cm2; |
| 59 | unsigned long uart1_phys; | ||
| 60 | unsigned long uart2_phys; | ||
| 61 | unsigned long uart3_phys; | ||
| 62 | unsigned long uart4_phys; | ||
| 63 | }; | 59 | }; |
| 64 | 60 | ||
| 65 | void omap2_set_globals_242x(void); | 61 | void omap2_set_globals_242x(void); |