git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[S390] Add support for memory hot-remove.
[safe/jmp/linux-2.6]
/
drivers
/
video
/
pm3fb.c
diff --git
a/drivers/video/pm3fb.c
b/drivers/video/pm3fb.c
index
0706599
..
68089d1
100644
(file)
--- a/
drivers/video/pm3fb.c
+++ b/
drivers/video/pm3fb.c
@@
-45,7
+45,7
@@
#undef PM3FB_MASTER_DEBUG
#ifdef PM3FB_MASTER_DEBUG
#define DPRINTK(a, b...) \
#undef PM3FB_MASTER_DEBUG
#ifdef PM3FB_MASTER_DEBUG
#define DPRINTK(a, b...) \
- printk(KERN_DEBUG "pm3fb: %s: " a, __
FUNCTION
__ , ## b)
+ printk(KERN_DEBUG "pm3fb: %s: " a, __
func
__ , ## b)
#else
#define DPRINTK(a, b...)
#endif
#else
#define DPRINTK(a, b...)
#endif
@@
-1227,7
+1227,7
@@
static struct fb_ops pm3fb_ops = {
/* mmio register are already mapped when this function is called */
/* the pm3fb_fix.smem_start is also set */
/* mmio register are already mapped when this function is called */
/* the pm3fb_fix.smem_start is also set */
-static unsigned long pm3fb_size_memory(struct pm3_par *par)
+static unsigned long
__devinit
pm3fb_size_memory(struct pm3_par *par)
{
unsigned long memsize = 0;
unsigned long tempBypass, i, temp1, temp2;
{
unsigned long memsize = 0;
unsigned long tempBypass, i, temp1, temp2;
@@
-1571,6
+1571,8
@@
module_exit(pm3fb_exit);
#endif
module_init(pm3fb_init);
#endif
module_init(pm3fb_init);
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
module_param(noaccel, bool, 0);
MODULE_PARM_DESC(noaccel, "Disable acceleration");
module_param(hwcursor, int, 0644);
module_param(noaccel, bool, 0);
MODULE_PARM_DESC(noaccel, "Disable acceleration");
module_param(hwcursor, int, 0644);