Fix x86 CPU merge dangling ends

arch/i386/kernel/cpu/cyrix.c

 #include <linux/init.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/pci.h>
 #include <linux/pci_ids.h>
+
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/processor.h>
@@ -199,7 +201,7 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)
 			 *  The 5510/5520 companion chips have a funky PIT
 			 *  that breaks the TSC synchronizing, so turn it off
 			 */
-			if(pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) ||
+			if (pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) ||
 				pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, NULL))
 				clear_bit(X86_FEATURE_TSC, c->x86_capability);
 			return;

arch/i386/kernel/cpu/intel.c

@@ -315,7 +315,7 @@ static void __init init_intel(struct cpuinfo_x86 *c)
 too_many_siblings:
 
 	if (disable_P4_HT)
-		clear_bit(X86_FEATURE_HT, &c->x86_capability);
+		clear_bit(X86_FEATURE_HT, c->x86_capability);
 #endif
 
 	/* Disable the PN if appropriate */

arch/i386/kernel/cpu/proc.c

@@ -66,7 +66,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	else
 		seq_printf(m, "stepping\t: unknown\n");
 
-	if ( test_bit(X86_FEATURE_TSC, &c->x86_capability) ) {
+	if ( test_bit(X86_FEATURE_TSC, c->x86_capability) ) {
 		seq_printf(m, "cpu MHz\t\t: %lu.%03lu\n",
 			cpu_khz / 1000, (cpu_khz % 1000));
 	}
@@ -96,7 +96,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 		     c->wp_works_ok ? "yes" : "no");
 
 	for ( i = 0 ; i < 32*NCAPINTS ; i++ )
-		if ( test_bit(i, &c->x86_capability) &&
+		if ( test_bit(i, c->x86_capability) &&
 		     x86_cap_flags[i] != NULL )
 			seq_printf(m, " %s", x86_cap_flags[i]);