diff options
author | Paul Mackerras <paulus@samba.org> | 2007-05-10 15:08:37 +0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 15:08:37 +0400 |
commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /arch/i386/mach-voyager/voyager_basic.c | |
parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
download | linux-2ecf042ef530dd0943e41d84b6344f507941af3e.tar.xz |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/i386/mach-voyager/voyager_basic.c')
-rw-r--r-- | arch/i386/mach-voyager/voyager_basic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c index 8fe7e4593d5f..9b77b39b71a6 100644 --- a/arch/i386/mach-voyager/voyager_basic.c +++ b/arch/i386/mach-voyager/voyager_basic.c @@ -292,8 +292,8 @@ machine_emergency_restart(void) void mca_nmi_hook(void) { - __u8 dumpval __attribute__((unused)) = inb(0xf823); - __u8 swnmi __attribute__((unused)) = inb(0xf813); + __u8 dumpval __maybe_unused = inb(0xf823); + __u8 swnmi __maybe_unused = inb(0xf813); /* FIXME: assume dump switch pressed */ /* check to see if the dump switch was pressed */ |