git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
video
/
macmodes.c
diff --git
a/drivers/video/macmodes.c
b/drivers/video/macmodes.c
index
2fc7108
..
ab21495
100644
(file)
--- a/
drivers/video/macmodes.c
+++ b/
drivers/video/macmodes.c
@@
-15,7
+15,6
@@
* more details.
*/
* more details.
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/fb.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/fb.h>
#include <linux/string.h>
@@
-327,7
+326,6
@@
int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
}
return -EINVAL;
}
}
return -EINVAL;
}
-EXPORT_SYMBOL(mac_var_to_vmode);
/**
* mac_map_monitor_sense - Convert monitor sense to vmode
/**
* mac_map_monitor_sense - Convert monitor sense to vmode
@@
-371,8
+369,9
@@
EXPORT_SYMBOL(mac_map_monitor_sense);
*
*/
*
*/
-int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
- const char *mode_option, unsigned int default_bpp)
+int __devinit mac_find_mode(struct fb_var_screeninfo *var,
+ struct fb_info *info, const char *mode_option,
+ unsigned int default_bpp)
{
const struct fb_videomode *db = NULL;
unsigned int dbsize = 0;
{
const struct fb_videomode *db = NULL;
unsigned int dbsize = 0;
@@
-380,7
+379,7
@@
int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
if (mode_option && !strncmp(mode_option, "mac", 3)) {
mode_option += 3;
db = mac_modedb;
if (mode_option && !strncmp(mode_option, "mac", 3)) {
mode_option += 3;
db = mac_modedb;
- dbsize =
sizeof(mac_modedb)/sizeof(*
mac_modedb);
+ dbsize =
ARRAY_SIZE(
mac_modedb);
}
return fb_find_mode(var, info, mode_option, db, dbsize,
&mac_modedb[DEFAULT_MODEDB_INDEX], default_bpp);
}
return fb_find_mode(var, info, mode_option, db, dbsize,
&mac_modedb[DEFAULT_MODEDB_INDEX], default_bpp);