projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[powerpc.git]
/
drivers
/
macintosh
/
via-pmu68k.c
diff --git
a/drivers/macintosh/via-pmu68k.c
b/drivers/macintosh/via-pmu68k.c
index
d9986f3
..
356c721
100644
(file)
--- a/
drivers/macintosh/via-pmu68k.c
+++ b/
drivers/macintosh/via-pmu68k.c
@@
-22,7
+22,6
@@
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/delay.h>
-#include <linux/sched.h>
#include <linux/miscdevice.h>
#include <linux/blkdev.h>
#include <linux/pci.h>
#include <linux/miscdevice.h>
#include <linux/blkdev.h>
#include <linux/pci.h>
@@
-96,10
+95,10
@@
static int data_index;
static int data_len;
static int adb_int_pending;
static int pmu_adb_flags;
static int data_len;
static int adb_int_pending;
static int pmu_adb_flags;
-static int adb_dev_map
= 0
;
+static int adb_dev_map;
static struct adb_request bright_req_1, bright_req_2, bright_req_3;
static int pmu_kind = PMU_UNKNOWN;
static struct adb_request bright_req_1, bright_req_2, bright_req_3;
static int pmu_kind = PMU_UNKNOWN;
-static int pmu_fully_inited
= 0
;
+static int pmu_fully_inited;
int asleep;
BLOCKING_NOTIFIER_HEAD(sleep_notifier_list);
int asleep;
BLOCKING_NOTIFIER_HEAD(sleep_notifier_list);
@@
-847,7
+846,7
@@
pbook_pci_save(void)
n_pbook_pci_saves = npci;
if (npci == 0)
return;
n_pbook_pci_saves = npci;
if (npci == 0)
return;
- ps =
(struct pci_save *)
kmalloc(npci * sizeof(*ps), GFP_KERNEL);
+ ps = kmalloc(npci * sizeof(*ps), GFP_KERNEL);
pbook_pci_saves = ps;
if (ps == NULL)
return;
pbook_pci_saves = ps;
if (ps == NULL)
return;
@@
-1040,7
+1039,7
@@
static int pmu_ioctl(struct inode * inode, struct file *filp,
return -EINVAL;
}
return -EINVAL;
}
-static struct file_operations pmu_device_fops = {
+static
const
struct file_operations pmu_device_fops = {
.read = pmu_read,
.write = pmu_write,
.ioctl = pmu_ioctl,
.read = pmu_read,
.write = pmu_write,
.ioctl = pmu_ioctl,