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/68328fb.c | |
| parent | 7d8fe4cfc54b5fb2093e12cffa8ca74d3c88e0fa (diff) | |
| parent | 98d67f250472cdd0f8d083830be3ec9dbb0c65a8 (diff) | |
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/68328fb.c')
| -rw-r--r-- | drivers/video/fbdev/68328fb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/fbdev/68328fb.c b/drivers/video/fbdev/68328fb.c index 9811f1bad8d4..7db03ed77c76 100644 --- a/drivers/video/fbdev/68328fb.c +++ b/drivers/video/fbdev/68328fb.c @@ -84,9 +84,6 @@ static const struct fb_fix_screeninfo mc68x328fb_fix __initconst = { /* * Interface used by the world */ -int mc68x328fb_init(void); -int mc68x328fb_setup(char *); - static int mc68x328fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info); static int mc68x328fb_set_par(struct fb_info *info); @@ -403,7 +400,7 @@ static int mc68x328fb_mmap(struct fb_info *info, struct vm_area_struct *vma) #endif } -int __init mc68x328fb_setup(char *options) +static int __init mc68x328fb_setup(char *options) { if (!options || !*options) return 1; @@ -414,7 +411,7 @@ int __init mc68x328fb_setup(char *options) * Initialisation */ -int __init mc68x328fb_init(void) +static int __init mc68x328fb_init(void) { #ifndef MODULE char *option = NULL; |