diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 12:12:42 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 12:12:42 +0000 |
| commit | 0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2 (patch) | |
| tree | c2ab5e6d5ff4def2ffafe2cd61ac14aedb5a86e7 /arch/arm/mach-mx5/devices.h | |
| parent | 5b88128fd70dcf0d5d7c0ae7d7849777ff925bde (diff) | |
| parent | b9214b9780d6897a6892e7c8cc903168d6fef097 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx5/devices.h')
| -rw-r--r-- | arch/arm/mach-mx5/devices.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/devices.h b/arch/arm/mach-mx5/devices.h index 16891aa3573..55a5129bc29 100644 --- a/arch/arm/mach-mx5/devices.h +++ b/arch/arm/mach-mx5/devices.h @@ -3,4 +3,3 @@ extern struct platform_device mxc_usbh1_device; extern struct platform_device mxc_usbh2_device; extern struct platform_device mxc_usbdr_udc_device; extern struct platform_device mxc_hsi2c_device; -extern struct platform_device mxc_keypad_device; |