summaryrefslogtreecommitdiff
path: root/sys/arch/zaurus/include
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2010-06-07 16:34:21 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2010-06-07 16:34:21 +0000
commit104f94dd4b97509289ed863c89b58daf794e9a24 (patch)
tree45d6df2c1c07c7deafcf2f80cfb12320bbf17ef6 /sys/arch/zaurus/include
parentb68c74a8c5478357c68cc5bac072bea1271134fc (diff)
Break pxaudc into xscale and MD pieces so that palm and zaurus can correctly
share the driver with different GPIOs/IRQs Diff from marex via jasper.
Diffstat (limited to 'sys/arch/zaurus/include')
-rw-r--r--sys/arch/zaurus/include/machine_reg.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/zaurus/include/machine_reg.h b/sys/arch/zaurus/include/machine_reg.h
index d790b02e7ff..9d38fb6c77d 100644
--- a/sys/arch/zaurus/include/machine_reg.h
+++ b/sys/arch/zaurus/include/machine_reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: machine_reg.h,v 1.2 2009/09/03 21:40:29 marex Exp $ */
+/* $OpenBSD: machine_reg.h,v 1.3 2010/06/07 16:34:20 drahn Exp $ */
/* $NetBSD: lubbock_reg.h,v 1.1 2003/06/18 10:51:15 bsh Exp $ */
/*
@@ -75,9 +75,9 @@
#define C3000_RC_IRQ_PIN 13 /* remote control */
#define C3000_CF0_IRQ_PIN 94
#define C3000_CF1_IRQ_PIN 93
-#define PXA_USB_DEVICE_PIN 35 /* indicate connection type */
-#define PXA_USB_CONNECT_PIN 41 /* connection interrupt */
-#define PXA_USB_PULLUP_PIN 45 /* show/hide device presence */
+#define GPIO_USB_DEVICE 35 /* indicate connection type */
+#define GPIO_USB_DETECT 41 /* connection interrupt */
+#define GPIO_USB_PULLUP 45 /* show/hide device presence */
#define GPIO_HP_IN_C3000 116 /* headphone jack */
#define GPIO_MMC_DETECT 9 /* card detect */