diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 00:31:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 00:31:24 -0500 |
commit | 05f6ece6f37f987e9de643f6f76e8fb5d5b9e014 (patch) | |
tree | 5244e85d0dfb2619b0af4bc80a2c99dd579f79a5 /arch/parisc/kernel/firmware.c | |
parent | 35d138ae22f826f95f0f8d0285947582ccf4508f (diff) | |
parent | 58b6c58caef7a34eab7ec887288fa495696653e7 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'arch/parisc/kernel/firmware.c')
-rw-r--r-- | arch/parisc/kernel/firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index 553f8fe03224..2dc06b8e1817 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c | |||
@@ -80,7 +80,7 @@ static unsigned long pdc_result2[32] __attribute__ ((aligned (8))); | |||
80 | 80 | ||
81 | /* Firmware needs to be initially set to narrow to determine the | 81 | /* Firmware needs to be initially set to narrow to determine the |
82 | * actual firmware width. */ | 82 | * actual firmware width. */ |
83 | int parisc_narrow_firmware = 1; | 83 | int parisc_narrow_firmware __read_mostly = 1; |
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | /* On most currently-supported platforms, IODC I/O calls are 32-bit calls | 86 | /* On most currently-supported platforms, IODC I/O calls are 32-bit calls |