Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / pcm3680.h

diff --git a/lincan/include/pcm3680.h b/lincan/include/pcm3680.h
index 18a13e1e1890ae6871006bc75ccba1fa0feb0d4c..45b665c90981e065eb99a9f3551123b4afb7a6a2 100644 (file)
--- a/lincan/include/pcm3680.h
+++ b/lincan/include/pcm3680.h
@@ -12,8 +12,8 @@ int pcm3680_release_io(struct candevice_t *candev);
 int pcm3680_reset(struct candevice_t *candev); 
 int pcm3680_init_hw_data(struct candevice_t *candev);
 int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr);
-int pcm3680_init_obj_data(struct chip_t *chip, int objnr);
-void pcm3680_write_register(unsigned data, unsigned long address);
-unsigned pcm3680_read_register(unsigned long address);
+int pcm3680_init_obj_data(struct canchip_t *chip, int objnr);
+void pcm3680_write_register(unsigned data, can_ioptr_t address);
+unsigned pcm3680_read_register(can_ioptr_t address);
 int pcm3680_program_irq(struct candevice_t *candev);