diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 11:36:40 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 11:36:40 -0400 |
| commit | 31e918908ccaf2b651ed8f666120f2a03a97193f (patch) | |
| tree | 39aab36ced1932d06cb2e3cee037faae0b94a63b /drivers/net/can/sja1000/Kconfig | |
| parent | ae3759c2573031f1306496c6f9f32f20e86f03aa (diff) | |
| parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) | |
Merge 3.9-rc6 into usb-next
We want the fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can/sja1000/Kconfig')
| -rw-r--r-- | drivers/net/can/sja1000/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig index b39ca5b3ea7f..ff2ba86cd4a4 100644 --- a/drivers/net/can/sja1000/Kconfig +++ b/drivers/net/can/sja1000/Kconfig | |||
| @@ -46,6 +46,7 @@ config CAN_EMS_PCI | |||
| 46 | config CAN_PEAK_PCMCIA | 46 | config CAN_PEAK_PCMCIA |
| 47 | tristate "PEAK PCAN-PC Card" | 47 | tristate "PEAK PCAN-PC Card" |
| 48 | depends on PCMCIA | 48 | depends on PCMCIA |
| 49 | depends on HAS_IOPORT | ||
| 49 | ---help--- | 50 | ---help--- |
| 50 | This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels) | 51 | This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels) |
| 51 | from PEAK-System (http://www.peak-system.com). To compile this | 52 | from PEAK-System (http://www.peak-system.com). To compile this |