svn commit: r228155 - user/sbruno/1394dev/firewire

[Sean Bruno]

Author: sbruno
Date: Wed Nov 30 17:36:01 2011
New Revision: 228155
URL: http://svn.freebsd.org/changeset/base/228155

Log:
  Merge to HEAD

Modified:
  user/sbruno/1394dev/firewire/firewire.c
  user/sbruno/1394dev/firewire/fwohci_pci.c
Directory Properties:
  user/sbruno/1394dev/firewire/   (props changed)

Modified: user/sbruno/1394dev/firewire/firewire.c
==============================================================================
--- user/sbruno/1394dev/firewire/firewire.c	Wed Nov 30 14:17:20 2011	(r228154)
+++ user/sbruno/1394dev/firewire/firewire.c	Wed Nov 30 17:36:01 2011	(r228155)
@@ -30,11 +30,11 @@
  * 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.
- * 
- * $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -128,9 +128,8 @@ static device_method_t firewire_methods[
 
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	firewire_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 char *linkspeed[] = {
 	"S100", "S200", "S400", "S800",

Modified: user/sbruno/1394dev/firewire/fwohci_pci.c
==============================================================================
--- user/sbruno/1394dev/firewire/fwohci_pci.c	Wed Nov 30 14:17:20 2011	(r228154)
+++ user/sbruno/1394dev/firewire/fwohci_pci.c	Wed Nov 30 17:36:01 2011	(r228155)
@@ -30,10 +30,11 @@
  * 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.
- * 
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define BOUNCE_BUFFER_TEST	0
 
 #include <sys/param.h>
@@ -536,9 +537,8 @@ static device_method_t fwohci_methods[] 
 
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	fwohci_pci_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fwohci_driver = {