diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:45:14 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:45:14 -0400 |
| commit | cd07ecc828486e5887113c7dc4d9f9022145811b (patch) | |
| tree | f3950d6077a794d4500244b2f372c6912af15eec /arch/arm/plat-omap/include/mach/common.h | |
| parent | 4c50d22a0cf240918d53afbf9a8416a9d93aacee (diff) | |
| parent | b04e8975e70d9b2bc27c017f92b356b312692544 (diff) | |
Merge branch 'omap4' into for-next
Diffstat (limited to 'arch/arm/plat-omap/include/mach/common.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/common.h b/arch/arm/plat-omap/include/mach/common.h index 834f0b3aad18..fdeab421b4dc 100644 --- a/arch/arm/plat-omap/include/mach/common.h +++ b/arch/arm/plat-omap/include/mach/common.h | |||
| @@ -60,6 +60,7 @@ struct omap_globals { | |||
| 60 | void omap2_set_globals_242x(void); | 60 | void omap2_set_globals_242x(void); |
| 61 | void omap2_set_globals_243x(void); | 61 | void omap2_set_globals_243x(void); |
| 62 | void omap2_set_globals_343x(void); | 62 | void omap2_set_globals_343x(void); |
| 63 | void omap2_set_globals_443x(void); | ||
| 63 | 64 | ||
| 64 | /* These get called from omap2_set_globals_xxxx(), do not call these */ | 65 | /* These get called from omap2_set_globals_xxxx(), do not call these */ |
| 65 | void omap2_set_globals_tap(struct omap_globals *); | 66 | void omap2_set_globals_tap(struct omap_globals *); |