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 9371487e2b7649b7fc3daf965901167f768882a4..2bab005c0bfc8763b04850a738f0d701edab5737 100644 (file)
--- a/lincan/include/ssv.h
+++ b/lincan/include/ssv.h
@@ -2,7 +2,7 @@
  * Header file for the Linux CAN-bus driver.
  * Written by Arnaud Westenberg email:arnaud@casema.net
  * This software is released under the GPL-License.
- * Version 0.6  18 Sept 2000
+ * Version lincan-0.3  17 Jun 2004
  */
 
 int ssv_request_io(struct candevice_t *candev);
@@ -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 char 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);