changed usb vendor and product id.

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

diff --git a/lincan/src/pcccan.c b/lincan/src/pcccan.c
index f83b1c55140cc92aa9d42eb6e565423edac35828..b568912b10ced1697484ad1554c8b097b29bb2d9 100644 (file)
--- a/lincan/src/pcccan.c
+++ b/lincan/src/pcccan.c
@@ -20,7 +20,7 @@
 int pcccan_irq=-1;
 unsigned long pcccan_base=0x0;
 
-static can_spinlock_t pcccan_port_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(pcccan_port_lock);
 
 /*
  * IO_RANGE is the io-memory range that gets reserved, please adjust according
@@ -217,7 +217,7 @@ int pcccan_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/pcccan.c
  */
-int pcccan_init_obj_data(struct chip_t *chip, int objnr)
+int pcccan_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;