diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 11:13:00 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 11:13:00 +0100 |
| commit | 9ae21ca362679757786f5abe556c7943e9001426 (patch) | |
| tree | db4ab371195fed9d327745eaf12c912f3f74f0e2 /arch/arm/plat-mxc/include/mach/devices-common.h | |
| parent | 12ba8d1e9262ce81a695795410bd9ee5c9407ba1 (diff) | |
| parent | a3484ffd2acc196ca934369395fe9aac63ed1a47 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/devices-common.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index 86d7575a564..8c6896fd1e5 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h @@ -29,6 +29,10 @@ struct platform_device *__init imx_add_flexcan(int id, resource_size_t irq, const struct flexcan_platform_data *pdata); +#include <linux/gpio_keys.h> +struct platform_device *__init imx_add_gpio_keys( + const struct gpio_keys_platform_data *pdata); + #include <mach/i2c.h> struct imx_imx_i2c_data { int id; |