Merge branch 'master' into can-usb1

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

diff --git a/lincan/include/pccan.h b/lincan/include/pccan.h
index 62561dfae3aa74b3d15f119781903ec038bd6f63..35006c92ce556325ae65058e519189c1d27dc05d 100644 (file)
--- a/lincan/include/pccan.h
+++ b/lincan/include/pccan.h
@@ -18,9 +18,9 @@ int pccand_reset(struct candevice_t *candev);
 int pccanq_reset(struct candevice_t *candev); 
 int pccan_init_hw_data(struct candevice_t *candev);
 int pccan_init_chip_data(struct candevice_t *candev, int chipnr);
-int pccan_init_obj_data(struct chip_t *chip, int objnr);
-void pccan_write_register(unsigned data, unsigned long address);
-unsigned pccan_read_register(unsigned long address);
+int pccan_init_obj_data(struct canchip_t *chip, int objnr);
+void pccan_write_register(unsigned data, can_ioptr_t address);
+unsigned pccan_read_register(can_ioptr_t address);
 int pccan_program_irq(struct candevice_t *candev);