diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 03:52:14 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 03:52:14 +0400 |
| commit | 65af7c4608f7b7019e2faa220fb9624988965873 (patch) | |
| tree | 42be40284249ba4c2584023e94cd12c4df4cffdd /arch/arm/plat-omap/include/plat/omap_hwmod.h | |
| parent | b1e3be0647fec81887e55edbda0c56c0445f7b53 (diff) | |
| parent | 4c23c8da96de1af7ed88ee5258af613e8c03c3ad (diff) | |
| download | linux-65af7c4608f7b7019e2faa220fb9624988965873.tar.xz | |
Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap_hwmod.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 0e329ca88a70..9115aedd2124 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -496,7 +496,6 @@ struct omap_hwmod_class { * @_state: internal-use hwmod state * @_postsetup_state: internal-use state to leave the hwmod in after _setup() * @flags: hwmod flags (documented below) - * @omap_chip: OMAP chips this hwmod is present on * @_lock: spinlock serializing operations on this hwmod * @node: list node for hwmod list (internal use) * @@ -545,7 +544,6 @@ struct omap_hwmod { u8 _int_flags; u8 _state; u8 _postsetup_state; - const struct omap_chip_id omap_chip; }; int omap_hwmod_register(struct omap_hwmod **ohs); |