diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /include/asm-sh/floppy.h | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-sh/floppy.h')
| -rw-r--r-- | include/asm-sh/floppy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h index f030ca08052b..38d7a2942476 100644 --- a/include/asm-sh/floppy.h +++ b/include/asm-sh/floppy.h | |||
| @@ -227,7 +227,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) | |||
| 227 | return 0; | 227 | return 0; |
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | struct fd_routine_l { | 230 | static struct fd_routine_l { |
| 231 | int (*_request_dma)(unsigned int dmanr, const char * device_id); | 231 | int (*_request_dma)(unsigned int dmanr, const char * device_id); |
| 232 | void (*_free_dma)(unsigned int dmanr); | 232 | void (*_free_dma)(unsigned int dmanr); |
| 233 | int (*_get_dma_residue)(unsigned int dummy); | 233 | int (*_get_dma_residue)(unsigned int dummy); |