diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
commit | aaadff81195056c7c14e0d834b3318c624c0fd78 (patch) | |
tree | 34d66d8dcb25fa9ffb568f8acfdb317ddf203b44 /drivers/video | |
parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
parent | df7addbb45874f0f992266003155de5a22e1872f (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/arcfb.c | 2 | ||||
-rw-r--r-- | drivers/video/cyber2000fb.c | 4 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index 080db812ca48..2784f0a9d693 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
@@ -441,7 +441,7 @@ static int arcfb_ioctl(struct inode *inode, struct file *file, | |||
441 | * the fb. it's inefficient for them to do anything less than 64*8 | 441 | * the fb. it's inefficient for them to do anything less than 64*8 |
442 | * writes since we update the lcd in each write() anyway. | 442 | * writes since we update the lcd in each write() anyway. |
443 | */ | 443 | */ |
444 | static ssize_t arcfb_write(struct file *file, const char *buf, size_t count, | 444 | static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t count, |
445 | loff_t *ppos) | 445 | loff_t *ppos) |
446 | { | 446 | { |
447 | /* modded from epson 1355 */ | 447 | /* modded from epson 1355 */ |
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index c589d23e7f91..a9300f930ef2 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
@@ -1512,7 +1512,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) | |||
1512 | * I/O cycles storing into a reserved memory space at | 1512 | * I/O cycles storing into a reserved memory space at |
1513 | * physical address 0x3000000 | 1513 | * physical address 0x3000000 |
1514 | */ | 1514 | */ |
1515 | unsigned char *iop; | 1515 | unsigned char __iomem *iop; |
1516 | 1516 | ||
1517 | iop = ioremap(0x3000000, 0x5000); | 1517 | iop = ioremap(0x3000000, 0x5000); |
1518 | if (iop == NULL) { | 1518 | if (iop == NULL) { |
@@ -1526,7 +1526,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) | |||
1526 | writeb(EXT_BIU_MISC, iop + 0x3ce); | 1526 | writeb(EXT_BIU_MISC, iop + 0x3ce); |
1527 | writeb(EXT_BIU_MISC_LIN_ENABLE, iop + 0x3cf); | 1527 | writeb(EXT_BIU_MISC_LIN_ENABLE, iop + 0x3cf); |
1528 | 1528 | ||
1529 | iounmap((void *)iop); | 1529 | iounmap(iop); |
1530 | #else | 1530 | #else |
1531 | /* | 1531 | /* |
1532 | * Most other machine types are "normal", so | 1532 | * Most other machine types are "normal", so |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 7b4cd250bec8..9fc10b9e6f57 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -1396,7 +1396,8 @@ static struct platform_driver pxafb_driver = { | |||
1396 | int __devinit pxafb_setup(char *options) | 1396 | int __devinit pxafb_setup(char *options) |
1397 | { | 1397 | { |
1398 | # ifdef CONFIG_FB_PXA_PARAMETERS | 1398 | # ifdef CONFIG_FB_PXA_PARAMETERS |
1399 | strlcpy(g_options, options, sizeof(g_options)); | 1399 | if (options) |
1400 | strlcpy(g_options, options, sizeof(g_options)); | ||
1400 | # endif | 1401 | # endif |
1401 | return 0; | 1402 | return 0; |
1402 | } | 1403 | } |