From: ppisa Date: Tue, 9 Feb 2010 22:44:13 +0000 (+0100) Subject: Merge branch 'master' into can-usb1 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/a1a6972ab91d9315cc9a8ce2d728573d140d3628 Merge branch 'master' into can-usb1 --- a1a6972ab91d9315cc9a8ce2d728573d140d3628 diff --cc lincan/src/Makefile.omk index a273b78,155dee4..e9eecd6 --- a/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