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
rtc S3C: add device_init_wakeup() invokation
[safe/jmp/linux-2.6]
/
drivers
/
video
/
sstfb.c
diff --git
a/drivers/video/sstfb.c
b/drivers/video/sstfb.c
index
5eff28c
..
5b11a00
100644
(file)
--- a/
drivers/video/sstfb.c
+++ b/
drivers/video/sstfb.c
@@
-88,7
+88,7
@@
#include <linux/init.h>
#include <linux/slab.h>
#include <asm/io.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <asm/io.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include <video/sstfb.h>
#include <video/sstfb.h>
@@
-1006,7
+1006,7
@@
static int sst_set_pll_att_ti(struct fb_info *info,
break;
default:
dprintk("%s: wrong clock code '%d'\n",
break;
default:
dprintk("%s: wrong clock code '%d'\n",
- __
FUNCTION
__, clock);
+ __
func
__, clock);
return 0;
}
udelay(300);
return 0;
}
udelay(300);
@@
-1048,7
+1048,7
@@
static int sst_set_pll_ics(struct fb_info *info,
break;
default:
dprintk("%s: wrong clock code '%d'\n",
break;
default:
dprintk("%s: wrong clock code '%d'\n",
- __
FUNCTION
__, clock);
+ __
func
__, clock);
return 0;
}
udelay(300);
return 0;
}
udelay(300);
@@
-1079,7
+1079,7
@@
static void sst_set_vidmod_att_ti(struct fb_info *info, const int bpp)
sst_dac_write(DACREG_RMR, (cr0 & 0x0f) | DACREG_CR0_16BPP);
break;
default:
sst_dac_write(DACREG_RMR, (cr0 & 0x0f) | DACREG_CR0_16BPP);
break;
default:
- dprintk("%s: bad depth '%u'\n", __
FUNCTION
__, bpp);
+ dprintk("%s: bad depth '%u'\n", __
func
__, bpp);
break;
}
}
break;
}
}
@@
-1093,7
+1093,7
@@
static void sst_set_vidmod_ics(struct fb_info *info, const int bpp)
sst_dac_write(DACREG_ICS_CMD, DACREG_ICS_CMD_16BPP);
break;
default:
sst_dac_write(DACREG_ICS_CMD, DACREG_ICS_CMD_16BPP);
break;
default:
- dprintk("%s: bad depth '%u'\n", __
FUNCTION
__, bpp);
+ dprintk("%s: bad depth '%u'\n", __
func
__, bpp);
break;
}
}
break;
}
}
@@
-1133,7
+1133,7
@@
static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par *
}
if (!ret)
return 0;
}
if (!ret)
return 0;
- f_dprintk("%s found %s\n", __
FUNCTION
__, dacs[i].name);
+ f_dprintk("%s found %s\n", __
func
__, dacs[i].name);
par->dac_sw = dacs[i];
return 1;
}
par->dac_sw = dacs[i];
return 1;
}