git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
generic_nvram.c
diff --git
a/drivers/char/generic_nvram.c
b/drivers/char/generic_nvram.c
index
1b5e01e
..
43ff598
100644
(file)
--- a/
drivers/char/generic_nvram.c
+++ b/
drivers/char/generic_nvram.c
@@
-22,6
+22,9
@@
#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/nvram.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/nvram.h>
+#ifdef CONFIG_PPC_PMAC
+#include <asm/machdep.h>
+#endif
#define NVRAM_SIZE 8192
#define NVRAM_SIZE 8192
@@
-92,7
+95,7
@@
static int nvram_ioctl(struct inode *inode, struct file *file,
case IOC_NVRAM_GET_OFFSET: {
int part, offset;
case IOC_NVRAM_GET_OFFSET: {
int part, offset;
- if (
_machine != _MACH_Pmac
)
+ if (
!machine_is(powermac)
)
return -EINVAL;
if (copy_from_user(&part, (void __user*)arg, sizeof(part)) != 0)
return -EFAULT;
return -EINVAL;
if (copy_from_user(&part, (void __user*)arg, sizeof(part)) != 0)
return -EFAULT;