[PATCH] ppc64 g5: merge tree build fix

Stephen Rothwell sfr at canb.auug.org.au
Tue Sep 27 14:09:39 EST 2005


We removed __pmacdata in the merge.

Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---

 drivers/macintosh/smu.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

1b05b6c7386f0d2d9dc5c45a61865ee5768c6780
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1092,7 +1092,7 @@ static int smu_release(struct inode *ino
 }
 
 
-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
 	.release	= smu_release,
 };
 
-static struct miscdevice pmu_device __pmacdata = {
+static struct miscdevice pmu_device = {
 	MISC_DYNAMIC_MINOR, "smu", &smu_device_fops
 };
 



More information about the Linuxppc64-dev mailing list