Merge: The configuration control file for in OCERA tree build updated.

Merge commit 'remotes/sf-ocera-lincan/master'

diff --git a/lincan/README b/lincan/README
index 7c6509e25bf2576c37f7f93c2c0b53018ff6417c..eeb36827bd0d4fe39c3e2d6478dbb1191771b8f4 100644 (file)
--- a/lincan/README
+++ b/lincan/README
@@ -251,6 +251,7 @@ The hw argument can be one of:
 - pcm3680, for the PCM-3680 PC/104 card by Advantech
 - m437, for the M436 PC/104 card by SECO
 - bfadcan for sja1000 CAN embedded card made by BFAD GmbH
+- gensja1000io for many sja1000 I/O mapped cards (PCAN-PC/104 for example).
 - pikronisa for ISA memory mapped sja1000 CAN card made by PiKRON Ltd.
 - pimx1 for MX1_DIS1 extension board for PiMX1 ARM based BCC
 - msmcan for MICROSPACE IO space indexed i82527