diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 22:45:41 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 22:51:35 +0200 |
| commit | 382bc10fbe827191218d4eecfaca0995b085dbfd (patch) | |
| tree | fc335b59f754a5e4571937499c7296f06f27aba2 /arch/arm/plat-mxc/include/mach/common.h | |
| parent | ea3e643bbf03735f2109c2d18bee6263c2c71498 (diff) | |
| parent | 752ad5e82dfd83851e44a2b9da8761994cd7e61c (diff) | |
Merge branch 'depends/gpio' into for-next
Conflicts:
arch/arm/mach-imx/mm-imx1.c
arch/arm/mach-imx/mm-imx21.c
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx27.c
arch/arm/mach-imx/mm-imx31.c
arch/arm/mach-imx/mm-imx35.c
arch/arm/mach-mx5/mm.c
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/common.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 91fa2632aa5..4e3d97890d6 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h @@ -64,7 +64,7 @@ extern int mx51_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2); extern int mx53_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2); -extern struct platform_device *mxc_register_gpio(int id, +extern struct platform_device *mxc_register_gpio(char *name, int id, resource_size_t iobase, resource_size_t iosize, int irq, int irq_high); extern int mxc_register_device(struct platform_device *pdev, void *data); extern void mxc_set_cpu_type(unsigned int type); |