aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/device.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 09:07:51 -0400
committerArnd Bergmann <arnd@arndb.de>2011-10-31 09:07:51 -0400
commit86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (patch)
tree377327a40452c4282787f49456122bf1753a0255 /arch/arm/include/asm/device.h
parent6a8d2e2b504ce3d12cfa3934f545c9415441a5c3 (diff)
parent3ae3e253db7385238dd9d6c67c085afa3e770a56 (diff)
Merge branch 'omap/dt' into next/dt
Diffstat (limited to 'arch/arm/include/asm/device.h')
-rw-r--r--arch/arm/include/asm/device.h5
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 {
12#endif 12#endif
13}; 13};
14 14
15struct omap_device;
16
15struct pdev_archdata { 17struct pdev_archdata {
18#ifdef CONFIG_ARCH_OMAP
19 struct omap_device *od;
20#endif
16}; 21};
17 22
18#endif 23#endif