Module Name: src
Committed By: mbalmer
Date: Wed Aug 31 12:20:35 UTC 2011
Modified Files:
src/sys/dev/gpio: gpio.c gpiovar.h
Log Message:
Remove what I committed accidentally...
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/gpio/gpio.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/gpio/gpiovar.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/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.39 src/sys/dev/gpio/gpio.c:1.40
--- src/sys/dev/gpio/gpio.c:1.39 Wed Aug 31 12:07:26 2011
+++ src/sys/dev/gpio/gpio.c Wed Aug 31 12:20:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.39 2011/08/31 12:07:26 mbalmer Exp $ */
+/* $NetBSD: gpio.c,v 1.40 2011/08/31 12:20:35 mbalmer Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.39 2011/08/31 12:07:26 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.40 2011/08/31 12:20:35 mbalmer Exp $");
/*
* General Purpose Input/Output framework.
@@ -694,7 +694,6 @@
ga.ga_dvname = attach->ga_dvname;
ga.ga_offset = attach->ga_offset;
ga.ga_mask = attach->ga_mask;
- ga.ga_nolock = 1;
DPRINTF(("%s: attach %s with offset %d and mask "
"0x%02x\n", device_xname(sc->sc_dev), ga.ga_dvname,
ga.ga_offset, ga.ga_mask));
Index: src/sys/dev/gpio/gpiovar.h
diff -u src/sys/dev/gpio/gpiovar.h:1.12 src/sys/dev/gpio/gpiovar.h:1.13
--- src/sys/dev/gpio/gpiovar.h:1.12 Sun Aug 28 07:48:50 2011
+++ src/sys/dev/gpio/gpiovar.h Wed Aug 31 12:20:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiovar.h,v 1.12 2011/08/28 07:48:50 mbalmer Exp $ */
+/* $NetBSD: gpiovar.h,v 1.13 2011/08/31 12:20:35 mbalmer Exp $ */
/* $OpenBSD: gpiovar.h,v 1.3 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -73,7 +73,6 @@
int ga_offset;
uint32_t ga_mask;
char *ga_dvname;
- int ga_nolock;
};
/* GPIO pin map */