projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[GFS2] Fix up merge of Linus' kernel into GFS2
[powerpc.git]
/
drivers
/
char
/
lp.c
diff --git
a/drivers/char/lp.c
b/drivers/char/lp.c
index
b11a390
..
f875fda
100644
(file)
--- a/
drivers/char/lp.c
+++ b/
drivers/char/lp.c
@@
-114,7
+114,6
@@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/major.h>
@@
-667,7
+666,7
@@
static int lp_ioctl(struct inode *inode, struct file *file,
return retval;
}
return retval;
}
-static struct file_operations lp_fops = {
+static
const
struct file_operations lp_fops = {
.owner = THIS_MODULE,
.write = lp_write,
.ioctl = lp_ioctl,
.owner = THIS_MODULE,
.write = lp_write,
.ioctl = lp_ioctl,