summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx5/devices.h
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-08-06 18:37:02 +0400
committerChris Metcalf <cmetcalf@tilera.com>2010-08-06 18:37:02 +0400
commitab11b487402f97975f3ac1eeea09c82f4431481e (patch)
tree86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /arch/arm/mach-mx5/devices.h
parent1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 (diff)
parentfc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff)
downloadlinux-ab11b487402f97975f3ac1eeea09c82f4431481e.tar.xz
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/mach-mx5/devices.h')
-rw-r--r--arch/arm/mach-mx5/devices.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/devices.h b/arch/arm/mach-mx5/devices.h
index c879ae71cd5b..e509cfaad1d4 100644
--- a/arch/arm/mach-mx5/devices.h
+++ b/arch/arm/mach-mx5/devices.h
@@ -6,3 +6,7 @@ extern struct platform_device mxc_usbdr_host_device;
extern struct platform_device mxc_usbh1_device;
extern struct platform_device mxc_usbdr_udc_device;
extern struct platform_device mxc_wdt;
+extern struct platform_device mxc_i2c_device0;
+extern struct platform_device mxc_i2c_device1;
+extern struct platform_device mxc_hsi2c_device;
+extern struct platform_device mxc_keypad_device;