diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-25 07:11:17 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-25 07:11:17 +0200 |
| commit | 49327ad2bbbaf1945d5ba431522201574219d150 (patch) | |
| tree | 47beb374d0cfb77d401220f20e8cece4ce4469db /arch/arm/mach-ux500/include | |
| parent | Input: evdev - fix EVIOCSABS regression (diff) | |
| parent | Input: wacom - specify Cinitq supported tools (diff) | |
| download | linux-49327ad2bbbaf1945d5ba431522201574219d150.tar.xz linux-49327ad2bbbaf1945d5ba431522201574219d150.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/arm/mach-ux500/include')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/devices.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h index c2b2f2574947..12e6606e34b1 100644 --- a/arch/arm/mach-ux500/include/mach/devices.h +++ b/arch/arm/mach-ux500/include/mach/devices.h @@ -26,6 +26,7 @@ extern struct platform_device ux500_i2c3_device; extern struct platform_device u8500_i2c0_device; extern struct platform_device u8500_i2c4_device; extern struct platform_device u8500_dma40_device; +extern struct platform_device ux500_ske_keypad_device; void dma40_u8500ed_fixup(void); |