From 16813c164a5b4a964f0f399d76e7ad83ce5a4c2c Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 9 Aug 2012 09:32:09 +0200 Subject: [PATCH] --- yaml --- r: 351681 b: refs/heads/master c: af5fd6da40412002bd2ba3293fd11fe862e15d80 h: refs/heads/master i: 351679: 3d1da36f9b3641cc6848f7b1fcf4ecea38fd4a44 v: v3 --- [refs] | 2 +- trunk/drivers/net/can/sja1000/Kconfig | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 209e419cae7a..79ef184b851c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f66b0301fcab28f90c5c9249590a52239a005c5a +refs/heads/master: af5fd6da40412002bd2ba3293fd11fe862e15d80 diff --git a/trunk/drivers/net/can/sja1000/Kconfig b/trunk/drivers/net/can/sja1000/Kconfig index 1bed54f1d40e..b39ca5b3ea7f 100644 --- a/trunk/drivers/net/can/sja1000/Kconfig +++ b/trunk/drivers/net/can/sja1000/Kconfig @@ -99,11 +99,11 @@ config CAN_TSCAN1 tristate "TS-CAN1 PC104 boards" depends on ISA help - This driver is for Technologic Systems' TSCAN-1 PC104 boards. - http://www.embeddedarm.com/products/board-detail.php?product=TS-CAN1 - The driver supports multiple boards and automatically configures them: - PLD IO base addresses are read from jumpers JP1 and JP2, - IRQ numbers are read from jumpers JP4 and JP5, - SJA1000 IO base addresses are chosen heuristically (first that works). + This driver is for Technologic Systems' TSCAN-1 PC104 boards. + http://www.embeddedarm.com/products/board-detail.php?product=TS-CAN1 + The driver supports multiple boards and automatically configures them: + PLD IO base addresses are read from jumpers JP1 and JP2, + IRQ numbers are read from jumpers JP4 and JP5, + SJA1000 IO base addresses are chosen heuristically (first that works). endif