From 4c52dc451bc4c2f3e3dc988e2ec0ac836f0d6b5d Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 22 Nov 2014 20:31:20 +0000
Subject: [PATCH] There never was a PC Card joystick attachment that worked.
 Kill the current stub one until such time as one shows up.

---
 sys/conf/files           |  1 -
 sys/dev/joy/joy_pccard.c | 67 ----------------------------------------
 sys/modules/joy/Makefile |  3 +-
 3 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 sys/dev/joy/joy_pccard.c

diff --git a/sys/conf/files b/sys/conf/files
index e9928aafbdd..77a619d4b92 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1797,7 +1797,6 @@ dev/ixgbe/ixgbe_dcb_82599.c	optional ixgbe inet \
 dev/jme/if_jme.c		optional jme pci
 dev/joy/joy.c			optional joy
 dev/joy/joy_isa.c		optional joy isa
-dev/joy/joy_pccard.c		optional joy pccard
 dev/kbdmux/kbdmux.c		optional kbdmux
 dev/ksyms/ksyms.c		optional ksyms
 dev/le/am7990.c			optional le
diff --git a/sys/dev/joy/joy_pccard.c b/sys/dev/joy/joy_pccard.c
deleted file mode 100644
index 9fb823a4200..00000000000
--- a/sys/dev/joy/joy_pccard.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1995 Jean-Marc Zucconi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in this position and unchanged.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-#include <dev/joy/joyvar.h>
-
-#include <dev/pccard/pccardvar.h>
-
-#include "pccarddevs.h"
-
-static int
-joy_pccard_probe(device_t dev)
-{
-	/* For the moment, don't match anything :-) */
-	return(ENXIO);
-}
-
-static device_method_t joy_pccard_methods[] = {
-	DEVMETHOD(device_probe,		joy_pccard_probe),
-	DEVMETHOD(device_attach,	joy_attach),
-	DEVMETHOD(device_detach,	joy_detach),
-	{ 0, 0 }
-};
-
-static driver_t joy_pccard_driver = {
-    "joy",
-    joy_pccard_methods,
-    sizeof (struct joy_softc)
-};
-
-DRIVER_MODULE(joy, pccard, joy_pccard_driver, joy_devclass, 0, 0);
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index 71ba7f14692..826ea6fcfdd 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/joy
 
 KMOD=	joy
-SRCS=	bus_if.h device_if.h isa_if.h card_if.h joy.c joy_isa.c joy_pccard.c \
-	pccarddevs.h
+SRCS=	bus_if.h device_if.h isa_if.h joy.c joy_isa.c
 
 .include <bsd.kmod.mk>