From 6cf6aae29960c4382c49adf7625ec6015f084d4e Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 26 May 2013 14:54:06 +0000
Subject: [PATCH] Remove backwards compat layer which was added in r71419 (in
 2001).

This change is not intended for MFC.

Reviewed by:	peter
---
 Makefile.inc1 | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index fe8ea42e5704..99e6ed2560c9 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -892,16 +892,11 @@ NO_KERNELOBJ=		t
 KERNCONF=${KERNFAST}
 .endif
 .endif
-.if !defined(KERNCONF) && defined(KERNEL)
-KERNCONF=	${KERNEL}
-KERNWARN=
-.else
 .if ${TARGET_ARCH} == "powerpc64"
 KERNCONF?=	GENERIC64
 .else
 KERNCONF?=	GENERIC
 .endif
-.endif
 INSTKERNNAME?=	kernel
 
 KERNSRCDIR?=	${.CURDIR}/sys
@@ -929,12 +924,6 @@ buildkernel:
 .if empty(BUILDKERNELS)
 	@echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \
 	false
-.endif
-.if defined(KERNWARN)
-	@echo "--------------------------------------------------------------"
-	@echo ">>> WARNING: KERNEL= setting should be changed to KERNCONF="
-	@echo "--------------------------------------------------------------"
-	@sleep 3
 .endif
 	@echo
 .for _kernel in ${BUILDKERNELS}