diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-19 12:25:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-05-07 22:56:16 +0200 |
| commit | 6922a3d14e85040c022bbad23af4de5c03557e21 (patch) | |
| tree | 920ebd1e8c2d863522d99376f6e290ab4e487e4f /arch/arm/mach-mmp/ttc_dkb.c | |
| parent | 340d01335891347303e4ae8d07b4c7bfc1fa6dcc (diff) | |
| download | linux-stable-6922a3d14e85040c022bbad23af4de5c03557e21.tar.gz linux-stable-6922a3d14e85040c022bbad23af4de5c03557e21.tar.bz2 linux-stable-6922a3d14e85040c022bbad23af4de5c03557e21.zip | |
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/ttc_dkb.c')
| -rw-r--r-- | arch/arm/mach-mmp/ttc_dkb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c index 4f240760d4aa..345b2e6d5c7e 100644 --- a/arch/arm/mach-mmp/ttc_dkb.c +++ b/arch/arm/mach-mmp/ttc_dkb.c @@ -253,12 +253,12 @@ static struct spi_board_info spi_board_info[] __initdata = { static void __init add_disp(void) { - pxa_register_device(&pxa910_device_disp, + mmp_register_device(&pxa910_device_disp, &dkb_disp_info, sizeof(dkb_disp_info)); spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); - pxa_register_device(&pxa910_device_fb, + mmp_register_device(&pxa910_device_fb, &dkb_fb_info, sizeof(dkb_fb_info)); - pxa_register_device(&pxa910_device_panel, + mmp_register_device(&pxa910_device_panel, &dkb_tpo_panel_info, sizeof(dkb_tpo_panel_info)); } #endif |