diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/misc/ibmasm/ibmasm.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/misc/ibmasm/ibmasm.h')
| -rw-r--r-- | drivers/misc/ibmasm/ibmasm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h index 634d538ccd14..48d5abebfc30 100644 --- a/drivers/misc/ibmasm/ibmasm.h +++ b/drivers/misc/ibmasm/ibmasm.h | |||
| @@ -196,10 +196,10 @@ extern int ibmasm_send_os_state(struct service_processor *sp, int os_state); | |||
| 196 | 196 | ||
| 197 | /* low level message processing */ | 197 | /* low level message processing */ |
| 198 | extern int ibmasm_send_i2o_message(struct service_processor *sp); | 198 | extern int ibmasm_send_i2o_message(struct service_processor *sp); |
| 199 | extern irqreturn_t ibmasm_interrupt_handler(int irq, void * dev_id, struct pt_regs *regs); | 199 | extern irqreturn_t ibmasm_interrupt_handler(int irq, void * dev_id); |
| 200 | 200 | ||
| 201 | /* remote console */ | 201 | /* remote console */ |
| 202 | extern void ibmasm_handle_mouse_interrupt(struct service_processor *sp, struct pt_regs *regs); | 202 | extern void ibmasm_handle_mouse_interrupt(struct service_processor *sp); |
| 203 | extern int ibmasm_init_remote_input_dev(struct service_processor *sp); | 203 | extern int ibmasm_init_remote_input_dev(struct service_processor *sp); |
| 204 | extern void ibmasm_free_remote_input_dev(struct service_processor *sp); | 204 | extern void ibmasm_free_remote_input_dev(struct service_processor *sp); |
| 205 | 205 | ||