diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:07:51 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:07:51 +0400 |
| commit | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (patch) | |
| tree | 377327a40452c4282787f49456122bf1753a0255 /arch/arm/include | |
| parent | 6a8d2e2b504ce3d12cfa3934f545c9415441a5c3 (diff) | |
| parent | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (diff) | |
| download | linux-86c1e5a74af11e4817ffa6d7748d9ac1353b5b53.tar.xz | |
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 |