diff options
| author | scottl <scottl@FreeBSD.org> | 2008-02-06 05:33:17 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2008-02-06 05:33:17 +0000 |
| commit | 29a138460159a4b3484136a98f6cd90d1ee7d4f2 (patch) | |
| tree | 5916c6ccc477d2fffb605720c971bd115daa1ee0 | |
| parent | 4320a38bdb84801e33e480d1cc19e171ff3c0c5e (diff) | |
| download | FreeBSD-src-29a138460159a4b3484136a98f6cd90d1ee7d4f2.zip FreeBSD-src-29a138460159a4b3484136a98f6cd90d1ee7d4f2.tar.gz | |
Fix a symbol conflict between hptrr and hptmv
| -rw-r--r-- | sys/dev/hptrr/hptrr_os_bsd.c | 2 | ||||
| -rw-r--r-- | sys/dev/hptrr/osm.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/hptrr/hptrr_os_bsd.c b/sys/dev/hptrr/hptrr_os_bsd.c index ee74d21..a469e1b 100644 --- a/sys/dev/hptrr/hptrr_os_bsd.c +++ b/sys/dev/hptrr/hptrr_os_bsd.c @@ -298,5 +298,5 @@ void __os_dbgbreak(const char *file, int line) while (1); } -int hpt_dbg_level = 1; +int hptrr_dbg_level = 1; #endif diff --git a/sys/dev/hptrr/osm.h b/sys/dev/hptrr/osm.h index f991eaf..d0134ad 100644 --- a/sys/dev/hptrr/osm.h +++ b/sys/dev/hptrr/osm.h @@ -188,8 +188,8 @@ HPT_U8 os_get_vbus_seq(void *osext); int os_printk(char *fmt, ...); #ifdef DBG -extern int hpt_dbg_level; -#define KdPrint(x) do { if (hpt_dbg_level) os_printk x; } while (0) +extern int hptrr_dbg_level; +#define KdPrint(x) do { if (hptrr_dbg_level) os_printk x; } while (0) void __os_dbgbreak(const char *file, int line); #define os_dbgbreak() __os_dbgbreak(__FILE__, __LINE__) #define HPT_ASSERT(x) do { if (!(x)) os_dbgbreak(); } while (0) |
