From 196a95d22136ed6875d7d5b7f6685b34386010bb Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 27 Mar 2013 12:47:13 +0100 Subject: [PATCH] --- yaml --- r: 362030 b: refs/heads/master c: 3fd33497f80aa528ded0db2851b48638635d5caa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/can/sja1000/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 46048e7850fd..653d080cde07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f901b6bc404b67d96eca739857c097e022727b71 +refs/heads/master: 3fd33497f80aa528ded0db2851b48638635d5caa diff --git a/trunk/drivers/net/can/sja1000/Kconfig b/trunk/drivers/net/can/sja1000/Kconfig index b39ca5b3ea7f..ff2ba86cd4a4 100644 --- a/trunk/drivers/net/can/sja1000/Kconfig +++ b/trunk/drivers/net/can/sja1000/Kconfig @@ -46,6 +46,7 @@ config CAN_EMS_PCI config CAN_PEAK_PCMCIA tristate "PEAK PCAN-PC Card" depends on PCMCIA + depends on HAS_IOPORT ---help--- This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels) from PEAK-System (http://www.peak-system.com). To compile this