Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 8 Feb 2014 04:29:37 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r261616 - head/sys/dev/usb/controller
Message-ID:  <201402080429.s184TbNi085878@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: imp
Date: Sat Feb  8 04:29:36 2014
New Revision: 261616
URL: http://svnweb.freebsd.org/changeset/base/261616

Log:
  Remove FreeBSD 6 support

Modified:
  head/sys/dev/usb/controller/at91dci_atmelarm.c
  head/sys/dev/usb/controller/ohci_atmelarm.c

Modified: head/sys/dev/usb/controller/at91dci_atmelarm.c
==============================================================================
--- head/sys/dev/usb/controller/at91dci_atmelarm.c	Sat Feb  8 00:20:21 2014	(r261615)
+++ head/sys/dev/usb/controller/at91dci_atmelarm.c	Sat Feb  8 04:29:36 2014	(r261616)
@@ -212,13 +212,8 @@ at91_udp_attach(device_t dev)
 	}
 	device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus);
 
-#if (__FreeBSD_version >= 700031)
 	err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
 	    NULL, (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
-#else
-	err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
-	    (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
-#endif
 	if (err) {
 		sc->sc_dci.sc_intr_hdl = NULL;
 		goto error;

Modified: head/sys/dev/usb/controller/ohci_atmelarm.c
==============================================================================
--- head/sys/dev/usb/controller/ohci_atmelarm.c	Sat Feb  8 00:20:21 2014	(r261615)
+++ head/sys/dev/usb/controller/ohci_atmelarm.c	Sat Feb  8 04:29:36 2014	(r261616)
@@ -131,13 +131,8 @@ ohci_atmelarm_attach(device_t dev)
 
 	strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor));
 
-#if (__FreeBSD_version >= 700031)
 	err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
 	    NULL, (driver_intr_t *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl);
-#else
-	err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
-	    (driver_intr_t *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl);
-#endif
 	if (err) {
 		sc->sc_ohci.sc_intr_hdl = NULL;
 		goto error;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402080429.s184TbNi085878>