diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:07:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:07:51 +0100 |
| commit | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (patch) | |
| tree | 377327a40452c4282787f49456122bf1753a0255 /arch/arm/include | |
| parent | Merge branches 'msm/dt', 'imx/dt' and 'at91/dt' into next/dt (diff) | |
| parent | Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux... (diff) | |
| download | linux-86c1e5a74af11e4817ffa6d7748d9ac1353b5b53.tar.xz linux-86c1e5a74af11e4817ffa6d7748d9ac1353b5b53.zip | |
Merge branch 'omap/dt' into next/dt
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/device.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/device.h b/arch/arm/include/asm/device.h index 9f390ce335cb..b5c9f5b1f6a3 100644 --- a/arch/arm/include/asm/device.h +++ b/arch/arm/include/asm/device.h @@ -12,7 +12,12 @@ struct dev_archdata { #endif }; +struct omap_device; + struct pdev_archdata { +#ifdef CONFIG_ARCH_OMAP + struct omap_device *od; +#endif }; #endif |