To prevent future name collisions "chip_t" changed to "canchip_t"

[lincan.git] / lincan / src / pikronisa.c

diff --git a/lincan/src/pikronisa.c b/lincan/src/pikronisa.c
index 67f383f66dbeaf35a9c367d4ca50cae2ccb721ee..de7d4cb9612a6b2073b9b7a23355ec4944c692e0 100644 (file)
--- a/lincan/src/pikronisa.c
+++ b/lincan/src/pikronisa.c
@@ -88,7 +88,7 @@ int pikronisa_release_io(struct candevice_t *candev)
 int pikronisa_reset(struct candevice_t *candev)
 {
        int i;
-       struct chip_t *chip=candev->chip[0];
+       struct canchip_t *chip=candev->chip[0];
        unsigned cdr;
        
        pikronisa_write_register(sjaMOD_RM, chip->chip_base_addr+SJAMOD);
@@ -208,7 +208,7 @@ int pikronisa_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/pikronisa.c
  */
-int pikronisa_init_obj_data(struct chip_t *chip, int objnr)
+int pikronisa_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
        return 0;