diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-01-07 16:11:28 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-01-07 16:11:28 +0300 |
| commit | 2313f4700327fb7d6aa3989edfa5bffcd7080d36 (patch) | |
| tree | 4781ddf9b844024cede6c8e99d3d509192d977c9 /drivers/mfd/sun4i-gpadc.c | |
| parent | 70612d0e121e55ea3c057c526bf7374da41aa2f0 (diff) | |
| parent | cb3cfbf79aff7decb4e5ee69a7c74864497f61dc (diff) | |
| download | linux-2313f4700327fb7d6aa3989edfa5bffcd7080d36.tar.xz | |
Merge drm/drm-next into drm-misc-next
Staying in sync to drm-next, and to be able to pull ttm fixes.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/mfd/sun4i-gpadc.c')
| -rw-r--r-- | drivers/mfd/sun4i-gpadc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/sun4i-gpadc.c b/drivers/mfd/sun4i-gpadc.c index b346fbce3c01..cfe14d9bf6dc 100644 --- a/drivers/mfd/sun4i-gpadc.c +++ b/drivers/mfd/sun4i-gpadc.c @@ -18,7 +18,7 @@ #define ARCH_SUN5I_A13 1 #define ARCH_SUN6I_A31 2 -static struct resource adc_resources[] = { +static const struct resource adc_resources[] = { DEFINE_RES_IRQ_NAMED(SUN4I_GPADC_IRQ_FIFO_DATA, "FIFO_DATA_PENDING"), DEFINE_RES_IRQ_NAMED(SUN4I_GPADC_IRQ_TEMP_DATA, "TEMP_DATA_PENDING"), }; @@ -166,7 +166,7 @@ static int sun4i_gpadc_probe(struct platform_device *pdev) static struct platform_driver sun4i_gpadc_driver = { .driver = { .name = "sun4i-gpadc", - .of_match_table = of_match_ptr(sun4i_gpadc_of_match), + .of_match_table = sun4i_gpadc_of_match, }, .probe = sun4i_gpadc_probe, }; |