changed usb vendor and product id.

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

diff --git a/lincan/src/smartcan.c b/lincan/src/smartcan.c
index f9123fe93a3846bb0e58762fcfb3bdbcf0ea28f8..a7a990d5a8bcbcae6776a239fe2fe39cadb57d56 100644 (file)
--- a/lincan/src/smartcan.c
+++ b/lincan/src/smartcan.c
@@ -16,7 +16,7 @@
 int smartcan_irq=-1;
 unsigned long smartcan_base=0x0;
 
-static can_spinlock_t smartcan_port_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(smartcan_port_lock);
 
 int smartcan_request_io(struct candevice_t *candev)
 {
@@ -92,7 +92,7 @@ int smartcan_init_chip_data(struct candevice_t *candev, int chipnr)
        return 0;
 }
 
-int smartcan_init_obj_data(struct chip_t *chip, int objnr)
+int smartcan_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;