diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-30 09:14:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-30 09:14:51 +1100 |
| commit | 4240190ebdb203d3c7d8001398ecdf78ab9d4256 (patch) | |
| tree | e27b3f538b28f09caddbb4e71fba14896645ddf7 /drivers/staging | |
| parent | 3b965c798b63771d2d46743cdea4b967b7d6e941 (diff) | |
| parent | dc69d1af9e8d9cbbabff88bb35a6782187a22229 (diff) | |
Merge remote branch 'omap/for-next'
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/tidspbridge/core/_tiomap.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/staging/tidspbridge/core/_tiomap.h b/drivers/staging/tidspbridge/core/_tiomap.h index 1c1f157e167a..1159a500f49d 100644 --- a/drivers/staging/tidspbridge/core/_tiomap.h +++ b/drivers/staging/tidspbridge/core/_tiomap.h @@ -19,8 +19,19 @@ #ifndef _TIOMAP_ #define _TIOMAP_ -#include <plat/powerdomain.h> -#include <plat/clockdomain.h> +/* + * XXX These powerdomain.h/clockdomain.h includes are wrong and should + * be removed. No driver should call pwrdm_* or clkdm_* functions + * directly; they should rely on OMAP core code to do this. + */ +#include <mach-omap2/powerdomain.h> +#include <mach-omap2/clockdomain.h> +/* + * XXX These mach-omap2/ includes are wrong and should be removed. No + * driver should read or write to PRM/CM registers directly; they + * should rely on OMAP core code to do this. + */ +#include <mach-omap2/cm2xxx_3xxx.h> #include <mach-omap2/prm-regbits-34xx.h> #include <mach-omap2/cm-regbits-34xx.h> #include <dspbridge/devdefs.h> |