## Automatically generated incremental diff
## From:   linux-2.4.21-bk2
## To:     linux-2.4.21-bk3
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.21-bk2/Makefile linux-2.4.21-bk3/Makefile
--- linux-2.4.21-bk2/Makefile	2003-07-07 03:15:07.000000000 -0700
+++ linux-2.4.21-bk3/Makefile	2003-07-07 03:15:48.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 21
-EXTRAVERSION = -bk2
+EXTRAVERSION = -bk3
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.21-bk2/include/asm-i386/cpufeature.h linux-2.4.21-bk3/include/asm-i386/cpufeature.h
--- linux-2.4.21-bk2/include/asm-i386/cpufeature.h	2003-07-07 03:15:38.000000000 -0700
+++ linux-2.4.21-bk3/include/asm-i386/cpufeature.h	2003-07-07 03:16:56.000000000 -0700
@@ -67,9 +67,6 @@
 /* Intel defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
 #define X86_FEATURE_EST		(4*32+ 7) /* Enhanced SpeedStep */
 
-#define cpu_has(c, bit)            test_bit(bit, (c)->x86_capability)
-
-
 #define cpu_has(c, bit)		test_bit(bit, (c)->x86_capability)
 #define boot_cpu_has(bit)	test_bit(bit, boot_cpu_data.x86_capability)