summaryrefslogtreecommitdiff
path: root/include/asm-x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-15 17:53:07 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-15 17:53:07 +0200
commit529d0e402eee62b7bfc89ec5b763a9a875bb49fb (patch)
tree8dc654ba972df155f8d5246f485027cbc252bf44 /include/asm-x86
parent66d4bdf22b8652cda215e2653c8bbec7a767ed57 (diff)
parent0d5cdc97e242a5589e5dca23277675f4b4482490 (diff)
Merge branch 'x86/geode' into x86/urgent
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/geode.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h
index bb06027fc83e..2c1cda0b8a86 100644
--- a/include/asm-x86/geode.h
+++ b/include/asm-x86/geode.h
@@ -50,6 +50,7 @@ extern int geode_get_dev_base(unsigned int dev);
#define MSR_PIC_YSEL_HIGH 0x51400021
#define MSR_PIC_ZSEL_LOW 0x51400022
#define MSR_PIC_ZSEL_HIGH 0x51400023
+#define MSR_PIC_IRQM_LPC 0x51400025
#define MSR_MFGPT_IRQ 0x51400028
#define MSR_MFGPT_NR 0x51400029
@@ -237,7 +238,7 @@ static inline u16 geode_mfgpt_read(int timer, u16 reg)
}
extern int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable);
-extern int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable);
+extern int geode_mfgpt_set_irq(int timer, int cmp, int *irq, int enable);
extern int geode_mfgpt_alloc_timer(int timer, int domain);
#define geode_mfgpt_setup_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 1)