[PATCH] ppc64 g5: merge tree build fix
We removed __pmacdata in the merge. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
committed by
Paul Mackerras
parent
e607d98369
commit
6b67f62cf6
@@ -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 = {
|
|||||||
.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
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user