summaryrefslogtreecommitdiff
path: root/sys/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/arm')
-rw-r--r--sys/arch/arm/include/bus.h6
-rw-r--r--sys/arch/arm/mainbus/mainbus_io.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index 04408dbc798..e070c49fabb 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.11 2009/04/20 00:42:06 oga Exp $ */
+/* $OpenBSD: bus.h,v 1.12 2009/07/26 18:48:55 miod Exp $ */
/* $NetBSD: bus.h,v 1.12 2003/10/23 15:03:24 scw Exp $ */
/*-
@@ -386,7 +386,7 @@ bus_space_copy_4(bus_space_tag_t bst, bus_space_handle_t h1,
#define bs_map_proto(f) \
int __bs_c(f,_bs_map) (void *t, bus_addr_t addr, \
- bus_size_t size, int cacheable, bus_space_handle_t *bshp);
+ bus_size_t size, int flags, bus_space_handle_t *bshp);
#define bs_unmap_proto(f) \
void __bs_c(f,_bs_unmap) (void *t, bus_space_handle_t bsh, \
@@ -400,7 +400,7 @@ int __bs_c(f,_bs_subregion) (void *t, bus_space_handle_t bsh, \
#define bs_alloc_proto(f) \
int __bs_c(f,_bs_alloc) (void *t, bus_addr_t rstart, \
bus_addr_t rend, bus_size_t size, bus_size_t align, \
- bus_size_t boundary, int cacheable, bus_addr_t *addrp, \
+ bus_size_t boundary, int flags, bus_addr_t *addrp, \
bus_space_handle_t *bshp);
#define bs_free_proto(f) \
diff --git a/sys/arch/arm/mainbus/mainbus_io.c b/sys/arch/arm/mainbus/mainbus_io.c
index b29fb574f95..494246376c2 100644
--- a/sys/arch/arm/mainbus/mainbus_io.c
+++ b/sys/arch/arm/mainbus/mainbus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus_io.c,v 1.3 2007/05/25 16:45:59 krw Exp $ */
+/* $OpenBSD: mainbus_io.c,v 1.4 2009/07/26 18:48:55 miod Exp $ */
/* $NetBSD: mainbus_io.c,v 1.14 2003/12/06 22:05:33 bjh21 Exp $ */
/*
@@ -174,12 +174,12 @@ mainbus_bs_map(t, bpa, size, flags, bshp)
}
int
-mainbus_bs_alloc(t, rstart, rend, size, alignment, boundary, cacheable,
+mainbus_bs_alloc(t, rstart, rend, size, alignment, boundary, flags,
bpap, bshp)
void *t;
bus_addr_t rstart, rend;
bus_size_t size, alignment, boundary;
- int cacheable;
+ int flags;
bus_addr_t *bpap;
bus_space_handle_t *bshp;
{