diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /include/linux/m48t86.h | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
Diffstat (limited to 'include/linux/m48t86.h')
| -rw-r--r-- | include/linux/m48t86.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/m48t86.h b/include/linux/m48t86.h index 9065199319d0..915d6b4f0f89 100644 --- a/include/linux/m48t86.h +++ b/include/linux/m48t86.h | |||
| @@ -11,6 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | struct m48t86_ops | 12 | struct m48t86_ops |
| 13 | { | 13 | { |
| 14 | void (*writeb)(unsigned char value, unsigned long addr); | 14 | void (*writebyte)(unsigned char value, unsigned long addr); |
| 15 | unsigned char (*readb)(unsigned long addr); | 15 | unsigned char (*readbyte)(unsigned long addr); |
| 16 | }; | 16 | }; |