From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 Sep 2005 04:09:39 +0000 (+1000)
Subject: [PATCH] ppc64 g5: merge tree build fix
X-Git-Tag: v2.6.15-rc1~59^2~245
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b67f62cf655c80147435544a2f8f6f57e07ec87;p=linux-2.6

[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>
---

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index a85ac18dd2..5f28352962 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)
 }
 
 
-static struct file_operations smu_device_fops __pmacdata = {
+static struct file_operations smu_device_fops = {
 	.llseek		= no_llseek,
 	.read		= smu_read,
 	.write		= smu_write,
@@ -1101,7 +1101,7 @@ static struct file_operations smu_device_fops __pmacdata = {
 	.release	= smu_release,
 };
 
-static struct miscdevice pmu_device __pmacdata = {
+static struct miscdevice pmu_device = {
 	MISC_DYNAMIC_MINOR, "smu", &smu_device_fops
 };