diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /arch/alpha/kernel/irq_pyxis.c | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
Diffstat (limited to 'arch/alpha/kernel/irq_pyxis.c')
| -rw-r--r-- | arch/alpha/kernel/irq_pyxis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c index 69199a76ec4a..989ce46a0cf3 100644 --- a/arch/alpha/kernel/irq_pyxis.c +++ b/arch/alpha/kernel/irq_pyxis.c | |||
| @@ -71,7 +71,7 @@ pyxis_mask_and_ack_irq(unsigned int irq) | |||
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | static struct irq_chip pyxis_irq_type = { | 73 | static struct irq_chip pyxis_irq_type = { |
| 74 | .typename = "PYXIS", | 74 | .name = "PYXIS", |
| 75 | .startup = pyxis_startup_irq, | 75 | .startup = pyxis_startup_irq, |
| 76 | .shutdown = pyxis_disable_irq, | 76 | .shutdown = pyxis_disable_irq, |
| 77 | .enable = pyxis_enable_irq, | 77 | .enable = pyxis_enable_irq, |