Merge branch 'master' into can-usb1

diff --combined lincan/src/Makefile.omk
index a273b787cc33e7c1bcfc8aea4bc8bc7347c2f554,155dee403e11f30aa1a0d99d010240a9dc85adb1..e9eecd6ed8c057ef5c247dbdcd9477c50126a213
--- 1/lincan/src/Makefile.omk
--- 2/lincan/src/Makefile.omk
+++ b/lincan/src/Makefile.omk
@@@ -1,8 -1,8 +1,8 @@@
  lincan_cards_NAMES = pip pccan smartcan nsi cc_can104 ems_cpcpci \
                pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan gensja1000io gensja1000mm eb8245 \
 -              kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican virtual template
 +              kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican usbcan virtual template
  
- lincan_morecards_NAMES = esdpci266 hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 ts7kv nsi_canpci sh7760
+ lincan_morecards_NAMES = esdpci266 hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 ts7kv nsi_canpci sh7760 mpc5200
  
  default_CONFIG = CONFIG_OC_LINCAN=y CONFIG_OC_LINCANRTL=n CONFIG_OC_LINCANVME=n
  default_CONFIG += CONFIG_OC_LINCAN_PORTIO_ONLY=n CONFIG_OC_LINCAN_MEMIO_ONLY=n
@@@ -37,15 -37,16 +37,20 @@@ ifeq ($(CONFIG_OC_LINCAN_CARD_sh7760),y
  lincan_cards_SOURCES += sh7760.c
  endif
  
 +ifeq ($(CONFIG_OC_LINCAN_CARD_usbcan),y)
 +lincan_cards_SOURCES += kthread.c
 +endif
 +
  ifneq ($(filter hms30c7202_can ns_dev_can,$(lincan_cards_SELECTED)),)
  $(warning Not finished C_CAN support requested)
  lincan_cards_SOURCES += c_can.c c_can_irq.c
  endif
  
+ # both cannot be selected, full MPC5200 has precedence
+ ifeq ($(CONFIG_OC_LINCAN_CARD_mpc5200),y)
+ lincan_cards_SOURCES += mscan.c
+ endif
+ 
  ifneq ($(CONFIG_OC_LINCANRTL),y)
  
  kernel_MODULES = lincan