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

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

diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c
index 63e855675a8a3fee22f9eb5d7f51cd8305cbc666..5cefafa7a76cdeae537adf8b26bc373906d45e2b 100644 (file)
--- a/lincan/src/pcm3680.c
+++ b/lincan/src/pcm3680.c
@@ -85,7 +85,7 @@ int pcm3680_release_io(struct candevice_t *candev)
 int pcm3680_reset(struct candevice_t *candev)
 {
        int i=0;
-       struct chip_t *chip;
+       struct canchip_t *chip;
        int chipnr;
        
        DEBUGMSG("Resetting pcm3680 hardware ...\n");
@@ -201,7 +201,7 @@ int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int pcm3680_init_obj_data(struct chip_t *chip, int objnr)
+int pcm3680_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;