diff options
Diffstat (limited to 'drivers/video/pxa.c')
| -rw-r--r-- | drivers/video/pxa.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/drivers/video/pxa.c b/drivers/video/pxa.c index 45efa6b71d..561a73fb32 100644 --- a/drivers/video/pxa.c +++ b/drivers/video/pxa.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Marc Kleine-Budde, Pengutronix * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * * Derived from the linux-2.6 pxa framebuffer driver: * * Copyright (C) 1999 Eric A. Thomas. @@ -32,10 +23,10 @@ #include <malloc.h> #include <linux/err.h> -#include <mach/clock.h> -#include <mach/pxa-regs.h> -#include <mach/regs-lcd.h> -#include <mach/pxafb.h> +#include <mach/pxa/clock.h> +#include <mach/pxa/pxa-regs.h> +#include <mach/pxa/regs-lcd.h> +#include <mach/pxa/pxafb.h> #include <asm/io.h> #include <linux/math64.h> @@ -83,7 +74,7 @@ struct pxafb_info { struct pxafb_videomode *mode; struct fb_info info; - struct device_d *dev; + struct device *dev; void (*lcd_power)(int); void (*backlight_power)(int); @@ -485,7 +476,7 @@ static struct fb_ops pxafb_ops = { .fb_disable = pxafb_disable_controller, }; -static int pxafb_probe(struct device_d *dev) +static int pxafb_probe(struct device *dev) { struct resource *iores; struct pxafb_platform_data *pdata = dev->platform_data; @@ -543,7 +534,7 @@ static int pxafb_probe(struct device_d *dev) return 0; } -static struct driver_d pxafb_driver = { +static struct driver pxafb_driver = { .name = "pxafb", .probe = pxafb_probe, }; |