From 61d9c8fa173f22fe93f358e528ef4b34625bd1e2 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Sat, 4 Oct 2008 10:39:31 +0000 Subject: [PATCH] - Spell cam correctly (scbus), this makes it possible to compile hptiop in GENERIC and LINT. [1] - Rename hpt_dbg_level to hpt_iop_dbg_level to avoid multiple definition of hpt_dbg_level (hptmv also has hpt_dbg_level). PR: 127551 [1] Reviewed by: scottl@ MFC after: 1 month --- sys/conf/files | 2 +- sys/dev/hptiop/hptiop.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 5559aea14996..2ff8204153ac 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -697,7 +697,7 @@ dev/hifn/hifn7751.c optional hifn dev/hme/if_hme.c optional hme dev/hme/if_hme_pci.c optional hme pci dev/hme/if_hme_sbus.c optional hme sbus -dev/hptiop/hptiop.c optional hptiop cam +dev/hptiop/hptiop.c optional hptiop scbus dev/hwpmc/hwpmc_logging.c optional hwpmc dev/hwpmc/hwpmc_mod.c optional hwpmc dev/ichsmb/ichsmb.c optional ichsmb diff --git a/sys/dev/hptiop/hptiop.h b/sys/dev/hptiop/hptiop.h index 42bc3303378a..0f74592d61de 100644 --- a/sys/dev/hptiop/hptiop.h +++ b/sys/dev/hptiop/hptiop.h @@ -32,8 +32,8 @@ __FBSDID("$FreeBSD$"); #define DBG 0 #ifdef DBG -int hpt_dbg_level = 0; -#define KdPrint(x) do { if (hpt_dbg_level) printf x; } while (0) +int hpt_iop_dbg_level = 0; +#define KdPrint(x) do { if (hpt_iop_dbg_level) printf x; } while (0) #define HPT_ASSERT(x) assert(x) #else #define KdPrint(x)