Module Name: src
Committed By: jmcneill
Date: Sun Apr 8 13:36:37 UTC 2018
Modified Files:
src/sys/arch/arm/sunxi: sunxi_musb.c
src/sys/conf: files
src/sys/dev/usb: motg.c
Log Message:
Remove MOTG_ALLWINNER option
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sunxi_musb.c
cvs rdiff -u -r1.1196 -r1.1197 src/sys/conf/files
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/motg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_musb.c
diff -u src/sys/arch/arm/sunxi/sunxi_musb.c:1.3 src/sys/arch/arm/sunxi/sunxi_musb.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_musb.c:1.3 Sun Dec 3 14:35:07 2017
+++ src/sys/arch/arm/sunxi/sunxi_musb.c Sun Apr 8 13:36:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_musb.c,v 1.3 2017/12/03 14:35:07 jmcneill Exp $ */
+/* $NetBSD: sunxi_musb.c,v 1.4 2018/04/08 13:36:37 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -26,13 +26,8 @@
* SUCH DAMAGE.
*/
-#include "opt_motg.h"
-#ifdef MOTG_ALLWINNER
-# error Do not define MOTG_ALLWINNER when using this driver
-#endif
-
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.3 2017/12/03 14:35:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.4 2018/04/08 13:36:37 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1196 src/sys/conf/files:1.1197
--- src/sys/conf/files:1.1196 Tue Feb 27 14:28:01 2018
+++ src/sys/conf/files Sun Apr 8 13:36:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1196 2018/02/27 14:28:01 maxv Exp $
+# $NetBSD: files,v 1.1197 2018/04/08 13:36:37 jmcneill Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1287,7 +1287,6 @@ device xhci: usbus, usbroothub, usb_dma
file dev/usb/xhci.c xhci needs-flag
# Mentor graphics OTG IP
-defflag opt_motg.h MOTG_ALLWINNER
device motg: usbus, usbroothub
file dev/usb/motg.c motg needs-flag
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.19 src/sys/dev/usb/motg.c:1.20
--- src/sys/dev/usb/motg.c:1.19 Fri Nov 17 08:22:02 2017
+++ src/sys/dev/usb/motg.c Sun Apr 8 13:36:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.19 2017/11/17 08:22:02 skrll Exp $ */
+/* $NetBSD: motg.c,v 1.20 2018/04/08 13:36:37 jmcneill Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,10 +40,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.19 2017/11/17 08:22:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.20 2018/04/08 13:36:37 jmcneill Exp $");
#ifdef _KERNEL_OPT
-#include "opt_motg.h"
#include "opt_usb.h"
#endif
@@ -68,12 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.1
#include <dev/usb/usb_mem.h>
#include <dev/usb/usbhist.h>
-#ifdef MOTG_ALLWINNER
-#include <arch/arm/allwinner/awin_otgreg.h>
-#else
#include <dev/usb/motgreg.h>
-#endif
-
#include <dev/usb/motgvar.h>
#include <dev/usb/usbroothub.h>
