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

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

diff --git a/lincan/include/ns_dev_can.h b/lincan/include/ns_dev_can.h
index 79be115e191dda59dd1fe5a65590dc20981bdc62..2e928d28342fe9c087a922288a1a1eeaa8107d07 100644 (file)
--- a/lincan/include/ns_dev_can.h
+++ b/lincan/include/ns_dev_can.h
@@ -20,8 +20,8 @@ int ns_dev_init_chip_data(struct candevice_t *candev, int chipnr);
 int ns_dev_request_io(struct candevice_t *candev);
 int ns_dev_release_io(struct candevice_t *candev);
 int ns_dev_reset(struct candevice_t *candev);
-void ns_dev_write_register(unsigned data, unsigned long address);
-unsigned ns_dev_read_register(unsigned long address);
+void ns_dev_write_register(unsigned data, can_ioptr_t address);
+unsigned ns_dev_read_register(can_ioptr_t address);
 
 int ns_dev_init_obj_data(struct canchip_t *chip, int objnr);
 int ns_dev_program_irq(struct candevice_t *candev);