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

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

diff --git a/lincan/include/pcccan.h b/lincan/include/pcccan.h
index 4efb380c0d92cc2edb804e11384940f2d9172d69..183186ba71274281fac83e6d221a5b94c6bb4f8d 100644 (file)
--- a/lincan/include/pcccan.h
+++ b/lincan/include/pcccan.h
@@ -12,8 +12,8 @@ int pcccan_release_io(struct candevice_t *candev);
 int pcccan_reset(struct candevice_t *candev); 
 int pcccan_init_hw_data(struct candevice_t *candev);
 int pcccan_init_chip_data(struct candevice_t *candev, int chipnr);
-int pcccan_init_obj_data(struct chip_t *chip, int objnr);
-void pcccan_write_register(unsigned data, unsigned long address);
-unsigned pcccan_read_register(unsigned long address);
+int pcccan_init_obj_data(struct canchip_t *chip, int objnr);
+void pcccan_write_register(unsigned data, can_ioptr_t address);
+unsigned pcccan_read_register(can_ioptr_t address);
 int pcccan_program_irq(struct candevice_t *candev);