Merge: Correction for 2.6.23-git kernel - unregister_chrdev() does not return value.

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

diff --git a/lincan/include/ssv.h b/lincan/include/ssv.h
index ca074fad6835a4ab706d984557cc841214c5aa70..2bab005c0bfc8763b04850a738f0d701edab5737 100644 (file)
--- a/lincan/include/ssv.h
+++ b/lincan/include/ssv.h
@@ -10,8 +10,8 @@ int ssv_release_io(struct candevice_t *candev);
 int ssv_reset(struct candevice_t *candev);
 int ssv_init_hw_data(struct candevice_t *candev);
 int ssv_init_chip_data(struct candevice_t *candev, int chipnr);
-int ssv_init_obj_data(struct chip_t *chip, int objnr);
-void ssv_write_register(unsigned data, unsigned long address);
-unsigned ssv_read_register(unsigned long address);
+int ssv_init_obj_data(struct canchip_t *chip, int objnr);
+void ssv_write_register(unsigned data, can_ioptr_t address);
+unsigned ssv_read_register(can_ioptr_t address);
 int ssv_program_irq(struct candevice_t *candev);