diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-05-01 11:59:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 11:59:23 -0400 |
commit | 14c6f52f607edd79e2969548c69ec311defdc17d (patch) | |
tree | 5e7c24b6119159361638e85c173e7e03f9b0c0fb /drivers | |
parent | 306958e8e8d150b3e8bf13f66f3a6e9be7ee75ff (diff) |
[PATCH] intelfb: Remove intelfbdrv.h
Ingo Oeser noticed that all that intelfbdrv.h contains are prototypes for
static functions - and such prototypes don't belong into header files.
This patch therefore removes drivers/video/intelfb/intelfbdrv.h and moves the
prototypes to intelfbdrv.c .
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 38 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.h | 68 |
2 files changed, 37 insertions, 69 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 6a05b7000830..549e22939260 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -135,9 +135,45 @@ | |||
135 | #endif | 135 | #endif |
136 | 136 | ||
137 | #include "intelfb.h" | 137 | #include "intelfb.h" |
138 | #include "intelfbdrv.h" | ||
139 | #include "intelfbhw.h" | 138 | #include "intelfbhw.h" |
140 | 139 | ||
140 | static void __devinit get_initial_mode(struct intelfb_info *dinfo); | ||
141 | static void update_dinfo(struct intelfb_info *dinfo, | ||
142 | struct fb_var_screeninfo *var); | ||
143 | static int intelfb_get_fix(struct fb_fix_screeninfo *fix, | ||
144 | struct fb_info *info); | ||
145 | |||
146 | static int intelfb_check_var(struct fb_var_screeninfo *var, | ||
147 | struct fb_info *info); | ||
148 | static int intelfb_set_par(struct fb_info *info); | ||
149 | static int intelfb_setcolreg(unsigned regno, unsigned red, unsigned green, | ||
150 | unsigned blue, unsigned transp, | ||
151 | struct fb_info *info); | ||
152 | |||
153 | static int intelfb_blank(int blank, struct fb_info *info); | ||
154 | static int intelfb_pan_display(struct fb_var_screeninfo *var, | ||
155 | struct fb_info *info); | ||
156 | |||
157 | static void intelfb_fillrect(struct fb_info *info, | ||
158 | const struct fb_fillrect *rect); | ||
159 | static void intelfb_copyarea(struct fb_info *info, | ||
160 | const struct fb_copyarea *region); | ||
161 | static void intelfb_imageblit(struct fb_info *info, | ||
162 | const struct fb_image *image); | ||
163 | static int intelfb_cursor(struct fb_info *info, | ||
164 | struct fb_cursor *cursor); | ||
165 | |||
166 | static int intelfb_sync(struct fb_info *info); | ||
167 | |||
168 | static int intelfb_ioctl(struct inode *inode, struct file *file, | ||
169 | unsigned int cmd, unsigned long arg, | ||
170 | struct fb_info *info); | ||
171 | |||
172 | static int __devinit intelfb_pci_register(struct pci_dev *pdev, | ||
173 | const struct pci_device_id *ent); | ||
174 | static void __devexit intelfb_pci_unregister(struct pci_dev *pdev); | ||
175 | static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo); | ||
176 | |||
141 | /* | 177 | /* |
142 | * Limiting the class to PCI_CLASS_DISPLAY_VGA prevents function 1 of the | 178 | * Limiting the class to PCI_CLASS_DISPLAY_VGA prevents function 1 of the |
143 | * mobile chipsets from being registered. | 179 | * mobile chipsets from being registered. |
diff --git a/drivers/video/intelfb/intelfbdrv.h b/drivers/video/intelfb/intelfbdrv.h deleted file mode 100644 index cc3058128884..000000000000 --- a/drivers/video/intelfb/intelfbdrv.h +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | #ifndef _INTELFBDRV_H | ||
2 | #define _INTELFBDRV_H | ||
3 | |||
4 | /* | ||
5 | ****************************************************************************** | ||
6 | * intelfb | ||
7 | * | ||
8 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G | ||
9 | * integrated graphics chips. | ||
10 | * | ||
11 | * Copyright © 2004 Sylvain Meyer | ||
12 | * | ||
13 | * Author: Sylvain Meyer | ||
14 | * | ||
15 | ****************************************************************************** | ||
16 | * This program is free software; you can redistribute it and/or modify | ||
17 | * it under the terms of the GNU General Public License as published by | ||
18 | * the Free Software Foundation; either version 2 of the License, or | ||
19 | * (at your option) any later version. | ||
20 | * | ||
21 | * This program is distributed in the hope that it will be useful, | ||
22 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
24 | * GNU General Public License for more details. | ||
25 | * | ||
26 | * You should have received a copy of the GNU General Public License | ||
27 | * along with this program; if not, write to the Free Software | ||
28 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
29 | */ | ||
30 | |||
31 | static void __devinit get_initial_mode(struct intelfb_info *dinfo); | ||
32 | static void update_dinfo(struct intelfb_info *dinfo, | ||
33 | struct fb_var_screeninfo *var); | ||
34 | static int intelfb_get_fix(struct fb_fix_screeninfo *fix, | ||
35 | struct fb_info *info); | ||
36 | |||
37 | static int intelfb_check_var(struct fb_var_screeninfo *var, | ||
38 | struct fb_info *info); | ||
39 | static int intelfb_set_par(struct fb_info *info); | ||
40 | static int intelfb_setcolreg(unsigned regno, unsigned red, unsigned green, | ||
41 | unsigned blue, unsigned transp, | ||
42 | struct fb_info *info); | ||
43 | |||
44 | static int intelfb_blank(int blank, struct fb_info *info); | ||
45 | static int intelfb_pan_display(struct fb_var_screeninfo *var, | ||
46 | struct fb_info *info); | ||
47 | |||
48 | static void intelfb_fillrect(struct fb_info *info, | ||
49 | const struct fb_fillrect *rect); | ||
50 | static void intelfb_copyarea(struct fb_info *info, | ||
51 | const struct fb_copyarea *region); | ||
52 | static void intelfb_imageblit(struct fb_info *info, | ||
53 | const struct fb_image *image); | ||
54 | static int intelfb_cursor(struct fb_info *info, | ||
55 | struct fb_cursor *cursor); | ||
56 | |||
57 | static int intelfb_sync(struct fb_info *info); | ||
58 | |||
59 | static int intelfb_ioctl(struct inode *inode, struct file *file, | ||
60 | unsigned int cmd, unsigned long arg, | ||
61 | struct fb_info *info); | ||
62 | |||
63 | static int __devinit intelfb_pci_register(struct pci_dev *pdev, | ||
64 | const struct pci_device_id *ent); | ||
65 | static void __devexit intelfb_pci_unregister(struct pci_dev *pdev); | ||
66 | static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo); | ||
67 | |||
68 | #endif | ||