git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
device.h
diff --git
a/arch/arm/include/asm/device.h
b/arch/arm/include/asm/device.h
index
6615f03
..
7aa3680
100644
(file)
--- a/
arch/arm/include/asm/device.h
+++ b/
arch/arm/include/asm/device.h
@@
-15,7
+15,12
@@
struct dev_archdata {
#endif
};
#endif
};
+struct omap_device;
+
struct pdev_archdata {
struct pdev_archdata {
+#ifdef CONFIG_ARCH_OMAP
+ struct omap_device *od;
+#endif
};
#endif
};
#endif