projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
[powerpc.git]
/
drivers
/
char
/
watchdog
/
wdrtas.c
diff --git
a/drivers/char/watchdog/wdrtas.c
b/drivers/char/watchdog/wdrtas.c
index
619e2ff
..
5c38cdf
100644
(file)
--- a/
drivers/char/watchdog/wdrtas.c
+++ b/
drivers/char/watchdog/wdrtas.c
@@
-26,7
+26,6
@@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@
-320,7
+319,7
@@
static int
wdrtas_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
wdrtas_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- int __user *argp = (void *)arg;
+ int __user *argp = (void
__user
*)arg;
int i;
static struct watchdog_info wdinfo = {
.options = WDRTAS_SUPPORTED_MASK,
int i;
static struct watchdog_info wdinfo = {
.options = WDRTAS_SUPPORTED_MASK,
@@
-521,7
+520,7
@@
wdrtas_reboot(struct notifier_block *this, unsigned long code, void *ptr)
/*** initialization stuff */
/*** initialization stuff */
-static struct file_operations wdrtas_fops = {
+static
const
struct file_operations wdrtas_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdrtas_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdrtas_write,
@@
-536,7
+535,7
@@
static struct miscdevice wdrtas_miscdev = {
.fops = &wdrtas_fops,
};
.fops = &wdrtas_fops,
};
-static struct file_operations wdrtas_temp_fops = {
+static
const
struct file_operations wdrtas_temp_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = wdrtas_temp_read,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = wdrtas_temp_read,