aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-27 00:09:39 -0400
committerPaul Mackerras <paulus@samba.org>2005-09-27 02:36:23 -0400
commit6b67f62cf655c80147435544a2f8f6f57e07ec87 (patch)
treefdbc706746344d4370ce3ae544c0a71ac833b147 /drivers/macintosh
parente607d98369dbd8e7b33b19664d1729a8a81fe7cd (diff)
[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>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/smu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index a85ac18dd21d..5f283529620b 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1092,7 +1092,7 @@ static int smu_release(struct inode *inode, struct file *file)
1092} 1092}
1093 1093
1094 1094
1095static struct file_operations smu_device_fops __pmacdata = { 1095static struct file_operations smu_device_fops = {
1096 .llseek = no_llseek, 1096 .llseek = no_llseek,
1097 .read = smu_read, 1097 .read = smu_read,
1098 .write = smu_write, 1098 .write = smu_write,
@@ -1101,7 +1101,7 @@ static struct file_operations smu_device_fops __pmacdata = {
1101 .release = smu_release, 1101 .release = smu_release,
1102}; 1102};
1103 1103
1104static struct miscdevice pmu_device __pmacdata = { 1104static struct miscdevice pmu_device = {
1105 MISC_DYNAMIC_MINOR, "smu", &smu_device_fops 1105 MISC_DYNAMIC_MINOR, "smu", &smu_device_fops
1106}; 1106};
1107 1107