diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 14:09:39 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-27 16:36:23 +1000 |
| commit | 6b67f62cf655c80147435544a2f8f6f57e07ec87 (patch) | |
| tree | fdbc706746344d4370ce3ae544c0a71ac833b147 | |
| parent | e607d98369dbd8e7b33b19664d1729a8a81fe7cd (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>
| -rw-r--r-- | drivers/macintosh/smu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index a85ac18dd21..5f283529620 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 }; |