Commit 6b67f62c authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

[PATCH] ppc64 g5: merge tree build fix

We removed __pmacdata in the merge.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e607d983
...@@ -1092,7 +1092,7 @@ static int smu_release(struct inode *inode, struct file *file) ...@@ -1092,7 +1092,7 @@ static int smu_release(struct inode *inode, struct file *file)
} }
static struct file_operations smu_device_fops __pmacdata = { static struct file_operations smu_device_fops = {
.llseek = no_llseek, .llseek = no_llseek,
.read = smu_read, .read = smu_read,
.write = smu_write, .write = smu_write,
...@@ -1101,7 +1101,7 @@ static struct file_operations smu_device_fops __pmacdata = { ...@@ -1101,7 +1101,7 @@ static struct file_operations smu_device_fops __pmacdata = {
.release = smu_release, .release = smu_release,
}; };
static struct miscdevice pmu_device __pmacdata = { static struct miscdevice pmu_device = {
MISC_DYNAMIC_MINOR, "smu", &smu_device_fops MISC_DYNAMIC_MINOR, "smu", &smu_device_fops
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment