summaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorDanielC <puff65537@bansheeslibrary.com>2012-09-06 19:59:06 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-07 22:12:43 -0700
commit7040e556c90aefd7b0e1341f7490de20a33340d7 (patch)
tree5b3c3dd35a6e53112d16bcb231414e36b9a224ba /drivers/staging/Makefile
parent960cf81187833ed3f19850551d46377323043876 (diff)
downloadblackbird-op-linux-7040e556c90aefd7b0e1341f7490de20a33340d7.tar.gz
blackbird-op-linux-7040e556c90aefd7b0e1341f7490de20a33340d7.zip
staging: add Silicom Bypass driver
The Silicom Bypass Network Interface Cards (NICs) are network cards with paired ports (2 or 4). The pairs either act as a "wire" allowing the network packets to pass or insert the device in between the two ports. When paired with the on-board hardware watchdog or other failsafe, they provide high availability for the network in the face of software outages or maintenance. Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ce4283205e85..0f04a28c8892 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -60,3 +60,4 @@ obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
obj-$(CONFIG_CSR_WIFI) += csr/
obj-$(CONFIG_OMAP_BANDGAP) += omap-thermal/
obj-$(CONFIG_ZCACHE2) += ramster/
+obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/
OpenPOWER on IntegriCloud