Merge branch 'can-usb1' into spican1

Conflicts:
	lincan/include/main.h

diff --cc lincan/include/main.h
index 853d2ffd453ff03415be66ed8df5a62d63b2d6d8,c82935bcf543cdeb95ea641dd10d7fccef2dac50..582d895e09efa924de6465353825c46aacaf5840
--- 1/lincan/include/main.h
--- 2/lincan/include/main.h
+++ b/lincan/include/main.h
@@@ -334,9 -330,11 +338,14 @@@ struct hwspecops_t 
        int (*program_irq)(struct candevice_t *candev);
        void (*write_register)(unsigned data, can_ioptr_t address);
        unsigned (*read_register)(can_ioptr_t address);
 +      int (*spi_acquire_bus)(struct candevice_t *candev, short channel, int block);
 +      void (*spi_release_bus)(struct candevice_t *candev, short channel);
 +      int (*spi_transfer)(struct candevice_t *candev, void *tx, void *rx, uint16_t len);
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+       void (*release_device)(struct kref *refcount);
+ #endif
+       
  };
  
  /**

diff --cc lincan/src/main.c
Simple merge

diff --cc lincan/src/setup.c
Simple merge