]> rtime.felk.cvut.cz Git - socketcan-devel.git/blobdiff - mkseries-dev/patches/DRIVER_SJA1000_KVASER_PCI.diff
Add script mkseries to create kernel patches from the trunk
[socketcan-devel.git] / mkseries-dev / patches / DRIVER_SJA1000_KVASER_PCI.diff
diff --git a/mkseries-dev/patches/DRIVER_SJA1000_KVASER_PCI.diff b/mkseries-dev/patches/DRIVER_SJA1000_KVASER_PCI.diff
new file mode 100644 (file)
index 0000000..73e3777
--- /dev/null
@@ -0,0 +1,32 @@
+---
+ drivers/net/can/Kconfig          |    7 +++++++
+ drivers/net/can/sja1000/Makefile |    1 +
+ 2 files changed, 8 insertions(+)
+
+Index: linux-2.6.25.6.OLD/drivers/net/can/Kconfig
+===================================================================
+--- linux-2.6.25.6.OLD.orig/drivers/net/can/Kconfig
++++ linux-2.6.25.6.OLD/drivers/net/can/Kconfig
+@@ -46,6 +46,13 @@ config CAN_IXXAT_PCI
+         This driver is for the IXXAT PC-I 04/PCI card (1 or 2 channel)
+         from the IXXAT Automation GmbH (http://www.ixxat.de).
++config CAN_KVASER_PCI
++      tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
++      depends on PCI && CAN_SJA1000
++      ---help---
++        This driver is for the the PCIcanx and PCIcan cards (1, 2 or
++        4 channel) from Kvaser (http://www.kvaser.com).
++
+ config CAN_DEBUG_DEVICES
+       bool "CAN devices debugging messages"
+       depends on CAN
+Index: linux-2.6.25.6.OLD/drivers/net/can/sja1000/Makefile
+===================================================================
+--- linux-2.6.25.6.OLD.orig/drivers/net/can/sja1000/Makefile
++++ linux-2.6.25.6.OLD/drivers/net/can/sja1000/Makefile
+@@ -6,3 +6,4 @@ obj-$(CONFIG_CAN_SJA1000) += sja1000.o
+ obj-$(CONFIG_CAN_EMS_PCI) += ems_pci.o
+ obj-$(CONFIG_CAN_IXXAT_PCI) += ixxat_pci.o
++obj-$(CONFIG_CAN_KVASER_PCI) += kvaser_pci.o