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 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
iseries
/
mf.c
diff --git
a/arch/powerpc/platforms/iseries/mf.c
b/arch/powerpc/platforms/iseries/mf.c
index
b5737d6
..
cff15ae
100644
(file)
--- a/
arch/powerpc/platforms/iseries/mf.c
+++ b/
arch/powerpc/platforms/iseries/mf.c
@@
-1178,7
+1178,7
@@
static ssize_t proc_mf_change_vmlinux(struct file *file,
const char __user *buf,
size_t count, loff_t *ppos)
{
const char __user *buf,
size_t count, loff_t *ppos)
{
- struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+ struct proc_dir_entry *dp = PDE(file->f_
path.
dentry->d_inode);
ssize_t rc;
dma_addr_t dma_addr;
char *page;
ssize_t rc;
dma_addr_t dma_addr;
char *page;