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 /drivers/parisc/eisa.c | |
| parent | 35d138ae22f826f95f0f8d0285947582ccf4508f (diff) | |
| parent | 58b6c58caef7a34eab7ec887288fa495696653e7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'drivers/parisc/eisa.c')
| -rw-r--r-- | drivers/parisc/eisa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index 6362bf99eff6..3d94d86c1c9f 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | 57 | ||
| 58 | static DEFINE_SPINLOCK(eisa_irq_lock); | 58 | static DEFINE_SPINLOCK(eisa_irq_lock); |
| 59 | 59 | ||
| 60 | void __iomem *eisa_eeprom_addr; | 60 | void __iomem *eisa_eeprom_addr __read_mostly; |
| 61 | 61 | ||
| 62 | /* We can only have one EISA adapter in the system because neither | 62 | /* We can only have one EISA adapter in the system because neither |
| 63 | * implementation can be flexed. | 63 | * implementation can be flexed. |
| @@ -141,7 +141,7 @@ static int slave_mask; | |||
| 141 | * in the furure. | 141 | * in the furure. |
| 142 | */ | 142 | */ |
| 143 | /* irq 13,8,2,1,0 must be edge */ | 143 | /* irq 13,8,2,1,0 must be edge */ |
| 144 | static unsigned int eisa_irq_level; /* default to edge triggered */ | 144 | static unsigned int eisa_irq_level __read_mostly; /* default to edge triggered */ |
| 145 | 145 | ||
| 146 | 146 | ||
| 147 | /* called by free irq */ | 147 | /* called by free irq */ |