diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-19 13:25:06 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-05-07 23:56:16 +0300 |
| commit | 6922a3d14e85040c022bbad23af4de5c03557e21 (patch) | |
| tree | 920ebd1e8c2d863522d99376f6e290ab4e487e4f /arch/arm/mach-mmp/devices.c | |
| parent | 340d01335891347303e4ae8d07b4c7bfc1fa6dcc (diff) | |
| download | linux-6922a3d14e85040c022bbad23af4de5c03557e21.tar.xz | |
ARM: mmp: rename pxa_register_device
In a multiplatform kernel that includes both pxa and mmp, we get a link
failure from the clash of two pxa_register_device functions.
Rename the one in mach-mmp to mmp_register_device, along with with the
rename of pxa_device_desc.
Acked-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mmp/devices.c')
| -rw-r--r-- | arch/arm/mach-mmp/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c index 18bee66a671f..79f4a2aa5475 100644 --- a/arch/arm/mach-mmp/devices.c +++ b/arch/arm/mach-mmp/devices.c @@ -14,7 +14,7 @@ #include <linux/soc/mmp/cputype.h> #include "regs-usb.h" -int __init pxa_register_device(struct pxa_device_desc *desc, +int __init mmp_register_device(struct mmp_device_desc *desc, void *data, size_t size) { struct platform_device *pdev; |