svn commit: r187029 - in stable/7/sys: . conf contrib/pf dev/ath/ath_hal dev/cxgb dev/hptiop

[Antoine Brodin]

Author: antoine
Date: Sat Jan 10 17:56:50 2009
New Revision: 187029
URL: http://svn.freebsd.org/changeset/base/187029

Log:
  MFC r183590 to stable/7:
    - 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

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/conf/files
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/hptiop/hptiop.h

Modified: stable/7/sys/conf/files
==============================================================================
--- stable/7/sys/conf/files	Sat Jan 10 17:22:49 2009	(r187028)
+++ stable/7/sys/conf/files	Sat Jan 10 17:56:50 2009	(r187029)
@@ -685,7 +685,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

Modified: stable/7/sys/dev/hptiop/hptiop.h
==============================================================================
--- stable/7/sys/dev/hptiop/hptiop.h	Sat Jan 10 17:22:49 2009	(r187028)
+++ stable/7/sys/dev/hptiop/hptiop.h	Sat Jan 10 17:56:50 2009	(r187029)
@@ -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)