Changes:
arch/i386/kernel/setup.c:
printk cleanup, add KERN_xxx
drivers/atm/nicstar.c:
do not export kernel_version anymore
drivers/char/misc.c:
fix link error, because pcpad100_init no longer
exists (now done via initcalls)
drivers/char/rocket.c:
do not export kernel_version anymore.
Remove NEW_MODULES define, not needed.
drivers/isdn/hisax/sedlbauer_cs.c:
fix pcmcia build, don't use dhinds's private includes here :)
drivers/scsi/megaraid.c:
do not export kernel_version anymore.
drivers/usb/ov511.c:
do not export kernel_version anymore.
drivers/usb/serial/io_edgeport.c:
include tty.h before other tty-related headers
diff -u linux_2_4/arch/i386/kernel/setup.c:1.1.1.53
linux_2_4/arch/i386/kernel/setup.c:1.1.1.53.2.1
--- linux_2_4/arch/i386/kernel/setup.c:1.1.1.53 Fri Mar 23 19:32:50 2001
+++ linux_2_4/arch/i386/kernel/setup.c Fri Mar 23 20:04:16 2001
@@ -294,7 +294,7 @@
visws_board_rev = raw;
}
- printk("Silicon Graphics %s (rev %d)\n",
+ printk(KERN_INFO "Silicon Graphics %s (rev %d)\n",
visws_board_type == VISWS_320 ? "320" :
(visws_board_type == VISWS_540 ? "540" :
"unknown"),
@@ -401,7 +401,7 @@
int x = e820.nr_map;
if (x == E820MAX) {
- printk("Ooops! Too many entries in the memory map!\n");
+ printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
return;
}
@@ -522,7 +522,7 @@
add_memory_region(0, LOWMEMSIZE(), E820_RAM);
add_memory_region(HIGH_MEMORY, mem_size << 10, E820_RAM);
}
- printk("BIOS-provided physical RAM map:\n");
+ printk(KERN_INFO "BIOS-provided physical RAM map:\n");
print_memory_map(who);
} /* setup_memory_region */
@@ -592,7 +592,7 @@
*to = '\0';
*cmdline_p = command_line;
if (usermem) {
- printk("user-defined physical RAM map:\n");
+ printk(KERN_INFO "user-defined physical RAM map:\n");
print_memory_map("user");
}
}
@@ -799,7 +799,7 @@
initrd_end = initrd_start+INITRD_SIZE;
}
else {
- printk("initrd extends beyond end of memory "
+ printk(KERN_ERR "initrd extends beyond end of memory "
"(0x%08lx > 0x%08lx)\ndisabling initrd\n",
INITRD_START + INITRD_SIZE,
max_low_pfn << PAGE_SHIFT);
@@ -903,7 +903,7 @@
if (n >= 0x80000005) {
cpuid(0x80000005, &dummy, &dummy, &ecx, &edx);
- printk("CPU: L1 I Cache: %dK (%d bytes/line), D cache %dK (%d
bytes/line)\n",
+ printk(KERN_INFO "CPU: L1 I Cache: %dK (%d bytes/line), D cache %dK
+(%d bytes/line)\n",
edx>>24, edx&0xFF, ecx>>24, ecx&0xFF);
c->x86_cache_size=(ecx>>24)+(edx>>24);
}
@@ -927,7 +927,7 @@
c->x86_cache_size = l2size;
- printk("CPU: L2 Cache: %dK (%d bytes/line)\n",
+ printk(KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n",
l2size, ecx & 0xFF);
}
@@ -1340,7 +1340,7 @@
name="C6";
fcr_set=ECX8|DSMC|EDCTLB|EMMX|ERETSTK;
fcr_clr=DPDC;
- printk("Disabling bugged TSC.\n");
+ printk(KERN_NOTICE "Disabling bugged TSC.\n");
clear_bit(X86_FEATURE_TSC, &c->x86_capability);
break;
case 8:
@@ -1377,10 +1377,10 @@
newlo=(lo|fcr_set) & (~fcr_clr);
if (newlo!=lo) {
- printk("Centaur FCR was 0x%X now 0x%X\n", lo, newlo );
+ printk(KERN_INFO "Centaur FCR was 0x%X now 0x%X\n",
+lo, newlo );
wrmsr(0x107, newlo, hi );
} else {
- printk("Centaur FCR is 0x%X\n",lo);
+ printk(KERN_INFO "Centaur FCR is 0x%X\n",lo);
}
/* Emulate MTRRs using Centaur's MCR. */
set_bit(X86_FEATURE_CENTAUR_MCR, &c->x86_capability);
@@ -1433,7 +1433,7 @@
max = cpuid_eax(0x80860000);
if ( max >= 0x80860001 ) {
cpuid(0x80860001, &dummy, &cpu_rev, &cpu_freq, &cpu_flags);
- printk("CPU: Processor revision %u.%u.%u.%u, %u MHz\n",
+ printk(KERN_INFO "CPU: Processor revision %u.%u.%u.%u, %u MHz\n",
(cpu_rev >> 24) & 0xff,
(cpu_rev >> 16) & 0xff,
(cpu_rev >> 8) & 0xff,
@@ -1442,7 +1442,7 @@
}
if ( max >= 0x80860002 ) {
cpuid(0x80860002, &dummy, &cms_rev1, &cms_rev2, &dummy);
- printk("CPU: Code Morphing Software revision %u.%u.%u-%u-%u\n",
+ printk(KERN_INFO "CPU: Code Morphing Software revision
+%u.%u.%u-%u-%u\n",
(cms_rev1 >> 24) & 0xff,
(cms_rev1 >> 16) & 0xff,
(cms_rev1 >> 8) & 0xff,
@@ -1471,7 +1471,7 @@
(void *)&cpu_info[56],
(void *)&cpu_info[60]);
cpu_info[64] = '\0';
- printk("CPU: %s\n", cpu_info);
+ printk(KERN_INFO "CPU: %s\n", cpu_info);
}
/* Unhide possibly hidden capability flags */
@@ -1503,7 +1503,7 @@
c->f00f_bug = 1;
if ( !f00f_workaround_enabled ) {
trap_init_f00f_bug();
- printk(KERN_INFO "Intel Pentium with F0 0F bug - workaround
enabled.\n");
+ printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround
+enabled.\n");
f00f_workaround_enabled = 1;
}
}
@@ -1611,12 +1611,12 @@
}
}
if ( l1i || l1d )
- printk("CPU: L1 I cache: %dK, L1 D cache: %dK\n",
+ printk(KERN_INFO "CPU: L1 I cache: %dK, L1 D cache: %dK\n",
l1i, l1d);
if ( l2 )
- printk("CPU: L2 cache: %dK\n", l2);
+ printk(KERN_INFO "CPU: L2 cache: %dK\n", l2);
if ( l3 )
- printk("CPU: L3 cache: %dK\n", l3);
+ printk(KERN_INFO "CPU: L3 cache: %dK\n", l3);
/*
* This assumes the L3 cache is shared; it typically lives in
@@ -1786,7 +1786,7 @@
rdmsr(0x119,lo,hi);
lo |= 0x200000;
wrmsr(0x119,lo,hi);
- printk(KERN_INFO "CPU serial number disabled.\n");
+ printk(KERN_NOTICE "CPU serial number disabled.\n");
clear_bit(X86_FEATURE_PN, &c->x86_capability);
}
}
@@ -1977,7 +1977,7 @@
}
}
- printk("CPU: Before vendor init, caps: %08x %08x %08x, vendor = %d\n",
+ printk(KERN_DEBUG "CPU: Before vendor init, caps: %08x %08x %08x, vendor =
+%d\n",
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
@@ -2024,7 +2024,7 @@
break;
}
- printk("CPU: After vendor init, caps: %08x %08x %08x %08x\n",
+ printk(KERN_DEBUG "CPU: After vendor init, caps: %08x %08x %08x %08x\n",
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
@@ -2064,7 +2064,7 @@
/* Now the feature flags better reflect actual CPU features! */
- printk("CPU: After generic, caps: %08x %08x %08x %08x\n",
+ printk(KERN_DEBUG "CPU: After generic, caps: %08x %08x %08x %08x\n",
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
@@ -2082,7 +2082,7 @@
boot_cpu_data.x86_capability[i] &= c->x86_capability[i];
}
- printk("CPU: Common caps: %08x %08x %08x %08x\n",
+ printk(KERN_DEBUG "CPU: Common caps: %08x %08x %08x %08x\n",
boot_cpu_data.x86_capability[0],
boot_cpu_data.x86_capability[1],
boot_cpu_data.x86_capability[2],
@@ -2250,16 +2250,16 @@
struct tss_struct * t = &init_tss[nr];
if (test_and_set_bit(nr, &cpu_initialized)) {
- printk("CPU#%d already initialized!\n", nr);
+ printk(KERN_WARNING "CPU#%d already initialized!\n", nr);
for (;;) __sti();
}
- printk("Initializing CPU#%d\n", nr);
+ printk(KERN_INFO "Initializing CPU#%d\n", nr);
if (cpu_has_vme || cpu_has_tsc || cpu_has_de)
clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
#ifndef CONFIG_X86_TSC
if (tsc_disable && cpu_has_tsc) {
- printk("Disabling TSC...\n");
+ printk(KERN_NOTICE "Disabling TSC...\n");
/**** FIX-HPA: DOES THIS REALLY BELONG HERE? ****/
clear_bit(X86_FEATURE_TSC, boot_cpu_data.x86_capability);
set_in_cr4(X86_CR4_TSD);
diff -u linux_2_4/drivers/atm/nicstar.c:1.1.1.12
linux_2_4/drivers/atm/nicstar.c:1.1.1.12.54.1
--- linux_2_4/drivers/atm/nicstar.c:1.1.1.12 Sun Feb 18 14:15:06 2001
+++ linux_2_4/drivers/atm/nicstar.c Fri Mar 23 20:04:16 2001
@@ -207,12 +207,6 @@
#endif /* NS_DEBUG_SPINLOCKS */
-/* Version definition *********************************************************/
-/*
-#include <linux/version.h>
-char kernel_version[] = UTS_RELEASE;
-*/
-
/* Function declarations ******************************************************/
static u32 ns_read_sram(ns_dev *card, u32 sram_address);
@@ -793,7 +787,7 @@
u32d[0] = NS_RCTE_RAWCELLINTEN;
#else
u32d[0] = 0x00000000;
-#endif RCQ_SUPPORT
+#endif /* RCQ_SUPPORT */
u32d[1] = 0x00000000;
u32d[2] = 0x00000000;
u32d[3] = 0xFFFFFFFF;
diff -u linux_2_4/drivers/char/misc.c:1.1.1.31
linux_2_4/drivers/char/misc.c:1.1.1.31.2.1
--- linux_2_4/drivers/char/misc.c:1.1.1.31 Fri Mar 23 19:26:36 2001
+++ linux_2_4/drivers/char/misc.c Fri Mar 23 20:04:16 2001
@@ -75,7 +75,6 @@
extern int ds1286_init(void);
extern int dsp56k_init(void);
extern int radio_init(void);
-extern int pc110pad_init(void);
extern int pmu_device_init(void);
extern int qpmouse_init(void);
extern int tosh_init(void);
@@ -248,9 +247,6 @@
create_proc_read_entry("misc", 0, 0, misc_read_proc, NULL);
#if defined CONFIG_82C710_MOUSE
qpmouse_init();
-#endif
-#ifdef CONFIG_PC110_PAD
- pc110pad_init();
#endif
#ifdef CONFIG_MVME16x
rtc_MK48T08_init();
diff -u linux_2_4/drivers/char/rocket.c:1.1.1.17
linux_2_4/drivers/char/rocket.c:1.1.1.17.20.1
--- linux_2_4/drivers/char/rocket.c:1.1.1.17 Mon Mar 5 15:48:05 2001
+++ linux_2_4/drivers/char/rocket.c Fri Mar 23 20:04:16 2001
@@ -46,8 +46,6 @@
#define ENABLE_PCI
#endif
-#define NEW_MODULES
-
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/major.h>
@@ -124,13 +122,6 @@
#undef TIME_STAT_VERBOSE /* Undef this if you want a terse log message. */
#define _INLINE_ inline
-
-#ifndef NEW_MODULES
-/*
- * NB. we must include the kernel idenfication string in to install the module.
- */
-/*static*/ char kernel_version[] = UTS_RELEASE;
-#endif
static struct r_port *rp_table[MAX_RP_PORTS];
static struct tty_struct *rocket_table[MAX_RP_PORTS];
diff -u linux_2_4/drivers/isdn/hisax/sedlbauer_cs.c:1.1.1.7
linux_2_4/drivers/isdn/hisax/sedlbauer_cs.c:1.1.1.7.2.1
--- linux_2_4/drivers/isdn/hisax/sedlbauer_cs.c:1.1.1.7 Fri Mar 23 19:30:14 2001
+++ linux_2_4/drivers/isdn/hisax/sedlbauer_cs.c Fri Mar 23 20:04:17 2001
@@ -37,9 +37,6 @@
======================================================================*/
-#include <pcmcia/config.h>
-#include <pcmcia/k_compat.h>
-
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
diff -u linux_2_4/drivers/scsi/megaraid.c:1.1.1.22
linux_2_4/drivers/scsi/megaraid.c:1.1.1.22.2.1
--- linux_2_4/drivers/scsi/megaraid.c:1.1.1.22 Fri Mar 23 19:28:34 2001
+++ linux_2_4/drivers/scsi/megaraid.c Fri Mar 23 20:04:18 2001
@@ -404,7 +404,6 @@
#include <linux/smp.h>
#define cpuid smp_processor_id()
-char kernel_version[] = UTS_RELEASE;
MODULE_AUTHOR ("American Megatrends Inc.");
MODULE_DESCRIPTION ("AMI MegaRAID driver");
@@ -433,7 +432,6 @@
#include <linux/smp.h>
#define cpuid smp_processor_id()
-char kernel_version[] = UTS_RELEASE;
MODULE_AUTHOR ("American Megatrends Inc.");
MODULE_DESCRIPTION ("AMI MegaRAID driver");
diff -u linux_2_4/drivers/usb/ov511.c:1.1.1.10
linux_2_4/drivers/usb/ov511.c:1.1.1.10.112.1
--- linux_2_4/drivers/usb/ov511.c:1.1.1.10 Sat Jan 6 23:36:39 2001
+++ linux_2_4/drivers/usb/ov511.c Fri Mar 23 20:04:22 2001
@@ -149,8 +149,6 @@
MODULE_AUTHOR("Mark McClelland <[EMAIL PROTECTED]> & Bret Wallach & Orion Sky Lawlor
<[EMAIL PROTECTED]> & Kevin Moore & Charl P. Botha <[EMAIL PROTECTED]> & Claudio Matsuoka
<[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("OV511 USB Camera Driver");
-char kernel_version[] = UTS_RELEASE;
-
static struct usb_driver ov511_driver;
/* I know, I know, global variables suck. This is only a temporary hack */
diff -u linux_2_4/drivers/usb/serial/io_edgeport.c:1.1.1.3
linux_2_4/drivers/usb/serial/io_edgeport.c:1.1.1.3.2.1
--- linux_2_4/drivers/usb/serial/io_edgeport.c:1.1.1.3 Fri Mar 23 19:31:38 2001
+++ linux_2_4/drivers/usb/serial/io_edgeport.c Fri Mar 23 20:04:22 2001
@@ -231,9 +231,9 @@
#include <linux/init.h>
#include <linux/malloc.h>
#include <linux/fcntl.h>
+#include <linux/tty.h>
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
-#include <linux/tty.h>
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/serial.h>
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
http://lists.sourceforge.net/lists/listinfo/linux-usb-devel
