From f77013558a1ac16b2460c2251ac00b4639cd2ea7 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Thu, 31 Jan 2008 11:48:55 +0000
Subject: [PATCH] Rename HAMMER to HAMMER_CPU (like I686_CPU) to not conflict
 with the kernel option for the HAMMER filesystem.

---
 sys/config/AMD64_GENERIC       | 4 ++--
 sys/platform/pc64/conf/options | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/config/AMD64_GENERIC b/sys/config/AMD64_GENERIC
index b2592f5e25..635df6abee 100644
--- a/sys/config/AMD64_GENERIC
+++ b/sys/config/AMD64_GENERIC
@@ -4,12 +4,12 @@
 # Check the LINT configuration file in sys/config, for an
 # exhaustive list of options.
 #
-# $DragonFly: src/sys/config/AMD64_GENERIC,v 1.1 2007/09/23 04:44:41 yanyh Exp $
+# $DragonFly: src/sys/config/AMD64_GENERIC,v 1.2 2008/01/31 11:48:54 swildner Exp $
 
 platform	pc64
 machine		amd64
 machine_arch	amd64
-cpu		HAMMER	
+cpu		HAMMER_CPU
 ident		AMD64_GENERIC
 maxusers	0
 
diff --git a/sys/platform/pc64/conf/options b/sys/platform/pc64/conf/options
index c9bea2dee4..0be3530797 100644
--- a/sys/platform/pc64/conf/options
+++ b/sys/platform/pc64/conf/options
@@ -1,10 +1,10 @@
 #
-# $DragonFly: src/sys/platform/pc64/conf/options,v 1.2 2007/09/24 03:24:45 yanyh Exp $
+# $DragonFly: src/sys/platform/pc64/conf/options,v 1.3 2008/01/31 11:48:55 swildner Exp $
 #
 
 # The cpu type
 #
-HAMMER			opt_cpu.h
+HAMMER_CPU			opt_cpu.h
 
 #
 #
-- 
2.41.0