git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[pandora-kernel.git]
/
drivers
/
macintosh
/
nvram.c
diff --git
a/drivers/macintosh/nvram.c
b/drivers/macintosh/nvram.c
index
c876349
..
a271c82
100644
(file)
--- a/
drivers/macintosh/nvram.c
+++ b/
drivers/macintosh/nvram.c
@@
-100,7
+100,7
@@
const struct file_operations nvram_fops = {
.llseek = nvram_llseek,
.read = read_nvram,
.write = write_nvram,
- .
ioctl
= nvram_ioctl,
+ .
unlocked_ioctl
= nvram_ioctl,
};
static struct miscdevice nvram_dev = {