diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /sound/oss/mpu401.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/oss/mpu401.h')
| -rw-r--r-- | sound/oss/mpu401.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/mpu401.h b/sound/oss/mpu401.h index 84c0e9522ef7..0ad1e9ee74f7 100644 --- a/sound/oss/mpu401.h +++ b/sound/oss/mpu401.h | |||
| @@ -3,10 +3,9 @@ | |||
| 3 | int probe_uart401 (struct address_info *hw_config, struct module *owner); | 3 | int probe_uart401 (struct address_info *hw_config, struct module *owner); |
| 4 | void unload_uart401 (struct address_info *hw_config); | 4 | void unload_uart401 (struct address_info *hw_config); |
| 5 | 5 | ||
| 6 | irqreturn_t uart401intr (int irq, void *dev_id, struct pt_regs * dummy); | 6 | irqreturn_t uart401intr (int irq, void *dev_id); |
| 7 | 7 | ||
| 8 | /* From mpu401.c */ | 8 | /* From mpu401.c */ |
| 9 | int probe_mpu401(struct address_info *hw_config, struct resource *ports); | 9 | int probe_mpu401(struct address_info *hw_config, struct resource *ports); |
| 10 | int attach_mpu401(struct address_info * hw_config, struct module *owner); | 10 | int attach_mpu401(struct address_info * hw_config, struct module *owner); |
| 11 | void unload_mpu401(struct address_info *hw_info); | 11 | void unload_mpu401(struct address_info *hw_info); |
| 12 | |||