Module Name: src
Committed By: christos
Date: Mon May 13 15:47:19 UTC 2013
Modified Files:
src/sys/dev/marvell: gttwsi.c mvspireg.h
Log Message:
There is no opt_mvsoc.h; the #ifdef ARMADAXP should be changed to some
inherited device property.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/marvell/gttwsi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/marvell/mvspireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/gttwsi.c
diff -u src/sys/dev/marvell/gttwsi.c:1.7 src/sys/dev/marvell/gttwsi.c:1.8
--- src/sys/dev/marvell/gttwsi.c:1.7 Wed May 1 08:25:31 2013
+++ src/sys/dev/marvell/gttwsi.c Mon May 13 11:47:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gttwsi.c,v 1.7 2013/05/01 12:25:31 rkujawa Exp $ */
+/* $NetBSD: gttwsi.c,v 1.8 2013/05/13 15:47:18 christos Exp $ */
/*
* Copyright (c) 2008 Eiji Kawauchi.
* All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gttwsi.c,v 1.7 2013/05/01 12:25:31 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gttwsi.c,v 1.8 2013/05/13 15:47:18 christos Exp $");
#include "locators.h"
#include <sys/param.h>
@@ -86,8 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: gttwsi.c,v 1
#include <dev/marvell/marvellvar.h>
#include <dev/marvell/gttwsireg.h>
-#include "opt_mvsoc.h"
-
struct gttwsi_softc {
device_t sc_dev;
bus_space_tag_t sc_bust;
Index: src/sys/dev/marvell/mvspireg.h
diff -u src/sys/dev/marvell/mvspireg.h:1.1 src/sys/dev/marvell/mvspireg.h:1.2
--- src/sys/dev/marvell/mvspireg.h:1.1 Wed May 1 08:17:17 2013
+++ src/sys/dev/marvell/mvspireg.h Mon May 13 11:47:18 2013
@@ -35,8 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
*******************************************************************************/
-#include "opt_mvsoc.h"
-
#ifndef _MVSPIREG_H_
#define _MVSPIREG_H_
