---

yaml --- r: 187081 b: refs/heads/master c: d6e976c h: refs/heads/master i: 187079: 57bc34f v: v3
git-mirror · Mar 8, 2010 · 02fe8af · 02fe8af
1 parent 321a21a
commit 02fe8af
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 153 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a965eb9f69caf0fb331d45556da8bab1c8dcb11
+refs/heads/master: d6e976c0d258c9547a308bd8a9a82ec93e2bc6e2
diff --git a/trunk/drivers/uio/Kconfig b/trunk/drivers/uio/Kconfig
@@ -44,17 +44,6 @@ config UIO_PDRV_GENIRQ
 
 	  If you don't know what to do here, say N.
 
-config UIO_SMX
-	tristate "SMX cryptengine UIO interface"
-	help
-	  Userspace IO interface to the Cryptography engine found on the
-	  Nias Digital SMX boards.  These will be available from Q4 2008
-	  from http://www.niasdigital.com.  The userspace part of this
-	  driver will be released under the GPL at the same time as the
-	  hardware and will be able to be downloaded from the same site.
-
-	  If you compile this as a module, it will be called uio_smx.
-
 config UIO_AEC
 	tristate "AEC video timestamp device"
 	depends on PCI

diff --git a/trunk/drivers/uio/Makefile b/trunk/drivers/uio/Makefile
@@ -2,7 +2,6 @@ obj-$(CONFIG_UIO)	+= uio.o
 obj-$(CONFIG_UIO_CIF)	+= uio_cif.o
 obj-$(CONFIG_UIO_PDRV)	+= uio_pdrv.o
 obj-$(CONFIG_UIO_PDRV_GENIRQ)	+= uio_pdrv_genirq.o
-obj-$(CONFIG_UIO_SMX)	+= uio_smx.o
 obj-$(CONFIG_UIO_AEC)	+= uio_aec.o
 obj-$(CONFIG_UIO_SERCOS3)	+= uio_sercos3.o
 obj-$(CONFIG_UIO_PCI_GENERIC)	+= uio_pci_generic.o

diff --git a/trunk/drivers/uio/uio_smx.c b/trunk/drivers/uio/uio_smx.c