Module Name: src
Committed By: he
Date: Mon Aug 3 06:57:09 UTC 2009
Modified Files:
src/sys/arch/arm/ep93xx: epgpio.c
Log Message:
Move the include of <sys/gpio.h> up above <dev/gpio/gpiovar.h>, so that
GPIOMAXNAME gets defined before being used. Also remove the > 0 test on
NGPIO around the include of <sys/gpio.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ep93xx/epgpio.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/ep93xx/epgpio.c
diff -u src/sys/arch/arm/ep93xx/epgpio.c:1.2 src/sys/arch/arm/ep93xx/epgpio.c:1.3
--- src/sys/arch/arm/ep93xx/epgpio.c:1.2 Fri Feb 27 03:13:55 2009
+++ src/sys/arch/arm/ep93xx/epgpio.c Mon Aug 3 06:57:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: epgpio.c,v 1.2 2009/02/27 03:13:55 kenh Exp $ */
+/* $NetBSD: epgpio.c,v 1.3 2009/08/03 06:57:09 he Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.2 2009/02/27 03:13:55 kenh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.3 2009/08/03 06:57:09 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -34,6 +34,7 @@
#include <sys/device.h>
#include <machine/bus.h>
#include <machine/intr.h>
+#include <sys/gpio.h>
#include <dev/gpio/gpiovar.h>
#include <arm/ep93xx/ep93xxvar.h>
#include <arm/ep93xx/epsocvar.h>
@@ -41,9 +42,6 @@
#include <arm/ep93xx/epgpiovar.h>
#include "opt_ep93xx_gpio_mask.h"
#include "gpio.h"
-#if NGPIO > 0
-#include <sys/gpio.h>
-#endif
#include "locators.h"
#ifdef EPGPIO_DEBUG