diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2022-10-05 10:21:55 +0100 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2022-10-05 10:21:55 +0100 |
| commit | edd1533d3ccd82dd5d600986d27d524e6be4c5fd (patch) | |
| tree | 1ac5ae82ea63114d5c13212e2819531e4507f800 /drivers/video/fbdev/skeletonfb.c | |
| parent | 7d8fe4cfc54b5fb2093e12cffa8ca74d3c88e0fa (diff) | |
| parent | 98d67f250472cdd0f8d083830be3ec9dbb0c65a8 (diff) | |
| download | linux-next-edd1533d3ccd82dd5d600986d27d524e6be4c5fd.tar.gz linux-next-edd1533d3ccd82dd5d600986d27d524e6be4c5fd.zip | |
Merge branch 'for-6.1/logitech' into for-linus
- Add hanlding of all Bluetooth HID++ devices and fixes in hid++
(Bastien Nocera)
Diffstat (limited to 'drivers/video/fbdev/skeletonfb.c')
| -rw-r--r-- | drivers/video/fbdev/skeletonfb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/skeletonfb.c b/drivers/video/fbdev/skeletonfb.c index d119b1d08007..8ab9a3fbd281 100644 --- a/drivers/video/fbdev/skeletonfb.c +++ b/drivers/video/fbdev/skeletonfb.c @@ -131,8 +131,6 @@ static struct fb_info info; */ static struct xxx_par __initdata current_par; -int xxxfb_init(void); - /** * xxxfb_open - Optional function. Called when the framebuffer is * first accessed. @@ -886,7 +884,7 @@ static struct pci_driver xxxfb_driver = { MODULE_DEVICE_TABLE(pci, xxxfb_id_table); -int __init xxxfb_init(void) +static int __init xxxfb_init(void) { /* * For kernel boot options (in 'video=xxxfb:<options>' format) @@ -967,7 +965,7 @@ static struct platform_device *xxxfb_device; * Only necessary if your driver takes special options, * otherwise we fall back on the generic fb_setup(). */ -int __init xxxfb_setup(char *options) +static int __init xxxfb_setup(char *options) { /* Parse user specified options (`video=xxxfb:') */ } |