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

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

diff --git a/lincan/include/msmcan.h b/lincan/include/msmcan.h
index f2d2a00999f66dee2aa5b9440877b6bd0b01724d..5364809dd36aeb15161b3d45aec9bc5a44800e0c 100644 (file)
--- a/lincan/include/msmcan.h
+++ b/lincan/include/msmcan.h
@@ -12,8 +12,8 @@ int msmcan_release_io(struct candevice_t *candev);
 int msmcan_reset(struct candevice_t *candev); 
 int msmcan_init_hw_data(struct candevice_t *candev);
 int msmcan_init_chip_data(struct candevice_t *candev, int chipnr);
-int msmcan_init_obj_data(struct chip_t *chip, int objnr);
-void msmcan_write_register(unsigned data, unsigned long address);
-unsigned msmcan_read_register(unsigned long address);
+int msmcan_init_obj_data(struct canchip_t *chip, int objnr);
+void msmcan_write_register(unsigned data, can_ioptr_t address);
+unsigned msmcan_read_register(can_ioptr_t address);
 int msmcan_program_irq(struct candevice_t *candev);