git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull remove-hotkey into release branch
[sfrench/cifs-2.6.git]
/
drivers
/
macintosh
/
apm_emu.c
diff --git
a/drivers/macintosh/apm_emu.c
b/drivers/macintosh/apm_emu.c
index 8862a83b8d8480451453fc7e6625350ce7f46cb2..c5e4d43f97fcbe89c4bf69853cb618d3c5bab578 100644
(file)
--- a/
drivers/macintosh/apm_emu.c
+++ b/
drivers/macintosh/apm_emu.c
@@
-102,7
+102,7
@@
static struct pmu_sleep_notifier apm_sleep_notifier = {
SLEEP_LEVEL_USERLAND,
};
SLEEP_LEVEL_USERLAND,
};
-static c
har driver_version[] = "0.5";
/* no spaces */
+static c
onst char driver_version[] = "0.5";
/* no spaces */
#ifdef DEBUG
static char * apm_event_name[] = {
#ifdef DEBUG
static char * apm_event_name[] = {
@@
-321,7
+321,7
@@
static int do_open(struct inode * inode, struct file * filp)
{
struct apm_user * as;
{
struct apm_user * as;
- as =
(struct apm_user *)
kmalloc(sizeof(*as), GFP_KERNEL);
+ as = kmalloc(sizeof(*as), GFP_KERNEL);
if (as == NULL) {
printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
sizeof(*as));
if (as == NULL) {
printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
sizeof(*as));
@@
-501,7
+501,7
@@
static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
return p - buf;
}
return p - buf;
}
-static struct file_operations apm_bios_fops = {
+static
const
struct file_operations apm_bios_fops = {
.owner = THIS_MODULE,
.read = do_read,
.poll = do_poll,
.owner = THIS_MODULE,
.read = do_read,
.poll = do_poll,