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 'sh/driver-core'
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
devices.h
diff --git
a/arch/arm/mach-mx3/devices.h
b/arch/arm/mach-mx3/devices.h
index
42cf175
..
4f77eb5
100644
(file)
--- a/
arch/arm/mach-mx3/devices.h
+++ b/
arch/arm/mach-mx3/devices.h
@@
-25,4
+25,5
@@
extern struct platform_device mxc_spi_device1;
extern struct platform_device mxc_spi_device2;
extern struct platform_device imx_ssi_device0;
extern struct platform_device imx_ssi_device1;
-
+extern struct platform_device imx_ssi_device1;
+extern struct platform_device imx_wdt_device0;