[PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[Olaf Hering]

The following series of patches removes almost all inclusions
of linux/version.h. The 3 #defines are unused in most of the touched files.

A few drivers use the simple KERNEL_VERSION(a,b,c) macro, which is unfortunatly
in linux/version.h. This define moved to linux/utsname.h

There are also lots of #ifdef for long obsolete kernels, this will go as well.


quilt vi `find * -type f -name "*.[ch]"|xargs grep -El '(UTS_RELEASE|LINUX_VERSION_CODE|KERNEL_VERSION|linux/version.h)'|grep -Ev '(/(boot|coda|drm)/|~$)'`

search pattern:
/UTS_RELEASE|LINUX_VERSION_CODE|KERNEL_VERSION|linux/(utsname|version).h

PS: I hope my script is working ok.

[PATCH 1/82] remove linux/version.h include from arch/arm*

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove one LINUX_VERSION_CODE check

Signed-off-by: Olaf Hering <olh@suse.de>

arch/arm/mach-omap/leds-h2p2-debug.c |    1 -
arch/arm/mach-omap/ocpi.c            |    1 -
arch/arm/nwfpe/fpmodule.c            |    1 -
arch/arm26/nwfpe/fpmodule.c          |    3 ---
4 files changed, 6 deletions(-)

Index: linux-2.6.13-rc2-mm1/arch/arm26/nwfpe/fpmodule.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/arm26/nwfpe/fpmodule.c
+++ linux-2.6.13-rc2-mm1/arch/arm26/nwfpe/fpmodule.c
@@ -24,7 +24,6 @@
#include "fpa11.h"

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/config.h>

/* XXX */
@@ -46,10 +45,8 @@ typedef struct task_struct*	PTASK;

#ifdef MODULE
void fp_send_sig(unsigned long sig, PTASK p, int priv);
-#if LINUX_VERSION_CODE > 0x20115
MODULE_AUTHOR("Scott Bambrough <scottb@rebel.com>");
MODULE_DESCRIPTION("NWFPE floating point emulator");
-#endif

#else
#define fp_send_sig	send_sig
Index: linux-2.6.13-rc2-mm1/arch/arm/mach-omap/leds-h2p2-debug.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/arm/mach-omap/leds-h2p2-debug.c
+++ linux-2.6.13-rc2-mm1/arch/arm/mach-omap/leds-h2p2-debug.c
@@ -13,7 +13,6 @@
#include <linux/init.h>
#include <linux/kernel_stat.h>
#include <linux/sched.h>
-#include <linux/version.h>

#include <asm/io.h>
#include <asm/hardware.h>
Index: linux-2.6.13-rc2-mm1/arch/arm/mach-omap/ocpi.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/arm/mach-omap/ocpi.c
+++ linux-2.6.13-rc2-mm1/arch/arm/mach-omap/ocpi.c
@@ -25,7 +25,6 @@

#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
Index: linux-2.6.13-rc2-mm1/arch/arm/nwfpe/fpmodule.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/arm/nwfpe/fpmodule.c
+++ linux-2.6.13-rc2-mm1/arch/arm/nwfpe/fpmodule.c
@@ -24,7 +24,6 @@
#include "fpa11.h"

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/config.h>

/* XXX */

[PATCH 2/82] remove linux/version.h include from arch/cris

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

remove code for obsolete kernel versions

Signed-off-by: Olaf Hering <olh@suse.de>

arch/cris/arch-v10/drivers/pcf8563.c   |    1 -
arch/cris/arch-v10/kernel/fasttimer.c  |    1 -
arch/cris/arch-v32/drivers/nandflash.c |    1 -
arch/cris/arch-v32/drivers/pcf8563.c   |    1 -
arch/cris/arch-v32/kernel/fasttimer.c  |   25 -------------------------
5 files changed, 29 deletions(-)

Index: linux-2.6.13-rc2-mm1/arch/cris/arch-v10/drivers/pcf8563.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/cris/arch-v10/drivers/pcf8563.c
+++ linux-2.6.13-rc2-mm1/arch/cris/arch-v10/drivers/pcf8563.c
@@ -19,7 +19,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
Index: linux-2.6.13-rc2-mm1/arch/cris/arch-v10/kernel/fasttimer.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/cris/arch-v10/kernel/fasttimer.c
+++ linux-2.6.13-rc2-mm1/arch/cris/arch-v10/kernel/fasttimer.c
@@ -112,7 +112,6 @@
#include <asm/rtc.h>

#include <linux/config.h>
-#include <linux/version.h>

#include <asm/arch/svinto.h>
#include <asm/fasttimer.h>
Index: linux-2.6.13-rc2-mm1/arch/cris/arch-v32/drivers/pcf8563.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/cris/arch-v32/drivers/pcf8563.c
+++ linux-2.6.13-rc2-mm1/arch/cris/arch-v32/drivers/pcf8563.c
@@ -18,7 +18,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
Index: linux-2.6.13-rc2-mm1/arch/cris/arch-v32/drivers/nandflash.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/cris/arch-v32/drivers/nandflash.c
+++ linux-2.6.13-rc2-mm1/arch/cris/arch-v32/drivers/nandflash.c
@@ -14,7 +14,6 @@
*
*/

-#include <linux/version.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/module.h>
Index: linux-2.6.13-rc2-mm1/arch/cris/arch-v32/kernel/fasttimer.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/cris/arch-v32/kernel/fasttimer.c
+++ linux-2.6.13-rc2-mm1/arch/cris/arch-v32/kernel/fasttimer.c
@@ -121,7 +121,6 @@
#include <asm/system.h>

#include <linux/config.h>
-#include <linux/version.h>

#include <asm/arch/hwregs/reg_map.h>
#include <asm/arch/hwregs/reg_rdwr.h>
@@ -604,23 +603,9 @@ void schedule_usleep(unsigned long us)

#ifdef CONFIG_PROC_FS
static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
,int *eof, void *data_unused
-#else
-                        ,int unused
-#endif
);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
static struct proc_dir_entry *fasttimer_proc_entry;
-#else
-static struct proc_dir_entry fasttimer_proc_entry =
-{
-  0, 9, "fasttimer",
-  S_IFREG | S_IRUGO, 1, 0, 0,
-  0, NULL /* ops -- default to array */,
-  &proc_fasttimer_read /* get_info */,
-};
-#endif
#endif /* CONFIG_PROC_FS */

#ifdef CONFIG_PROC_FS
@@ -629,11 +614,7 @@ static struct proc_dir_entry fasttimer_p
#define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300)

static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
,int *eof, void *data_unused
-#else
-                        ,int unused
-#endif
)
{
unsigned long flags;
@@ -809,9 +790,7 @@ static int proc_fasttimer_read(char *buf

memcpy(buf, bigbuf + offset, len);
*start = buf;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
*eof = 1;
-#endif

return len;
}
@@ -975,12 +954,8 @@ void fast_timer_init(void)
printk("fast_timer_init()n");

#ifdef CONFIG_PROC_FS
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
if ((fasttimer_proc_entry = create_proc_entry( "fasttimer", 0, 0 )))
fasttimer_proc_entry->read_proc = proc_fasttimer_read;
-#else
-    proc_register_dynamic(&proc_root, &fasttimer_proc_entry);
-#endif
#endif /* PROC_FS */
if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt, SA_INTERRUPT,
"fast timer int", NULL))

[PATCH 3/82] remove linux/version.h include from arch/ia64

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

arch/ia64/kernel/perfmon.c  |    1 -
arch/ia64/sn/kernel/tiocx.c |    1 -
include/asm-ia64/sn/xp.h    |    1 -
3 files changed, 3 deletions(-)

Index: linux-2.6.13-rc2-mm1/arch/ia64/kernel/perfmon.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ia64/kernel/perfmon.c
+++ linux-2.6.13-rc2-mm1/arch/ia64/kernel/perfmon.c
@@ -37,7 +37,6 @@
#include <linux/vfs.h>
#include <linux/pagemap.h>
#include <linux/mount.h>
-#include <linux/version.h>
#include <linux/bitops.h>
#include <linux/rcupdate.h>

Index: linux-2.6.13-rc2-mm1/arch/ia64/sn/kernel/tiocx.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ia64/sn/kernel/tiocx.c
+++ linux-2.6.13-rc2-mm1/arch/ia64/sn/kernel/tiocx.c
@@ -8,7 +8,6 @@

#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/proc_fs.h>
Index: linux-2.6.13-rc2-mm1/include/asm-ia64/sn/xp.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/asm-ia64/sn/xp.h
+++ linux-2.6.13-rc2-mm1/include/asm-ia64/sn/xp.h
@@ -16,7 +16,6 @@
#define _ASM_IA64_SN_XP_H


-#include <linux/version.h>
#include <linux/cache.h>
#include <linux/hardirq.h>
#include <asm/sn/types.h>

[PATCH 4/82] remove linux/version.h include from arch/mips

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h |    1 -
arch/mips/pmc-sierra/yosemite/ht-irq.c            |    1 -
arch/mips/pmc-sierra/yosemite/ht.c                |    1 -
3 files changed, 3 deletions(-)

Index: linux-2.6.13-rc2-mm1/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h
+++ linux-2.6.13-rc2-mm1/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h
@@ -34,7 +34,6 @@
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/version.h>
#include <asm/pci.h>
#include <asm/io.h>
#include <linux/init.h>
Index: linux-2.6.13-rc2-mm1/arch/mips/pmc-sierra/yosemite/ht-irq.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/mips/pmc-sierra/yosemite/ht-irq.c
+++ linux-2.6.13-rc2-mm1/arch/mips/pmc-sierra/yosemite/ht-irq.c
@@ -26,7 +26,6 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <asm/pci.h>

Index: linux-2.6.13-rc2-mm1/arch/mips/pmc-sierra/yosemite/ht.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/mips/pmc-sierra/yosemite/ht.c
+++ linux-2.6.13-rc2-mm1/arch/mips/pmc-sierra/yosemite/ht.c
@@ -28,7 +28,6 @@
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/version.h>
#include <asm/pci.h>
#include <asm/io.h>

[PATCH 5/82] remove linux/version.h include from arch/parisc

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

arch/parisc/kernel/asm-offsets.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/arch/parisc/kernel/asm-offsets.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/parisc/kernel/asm-offsets.c
+++ linux-2.6.13-rc2-mm1/arch/parisc/kernel/asm-offsets.c
@@ -30,7 +30,6 @@
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/thread_info.h>
-#include <linux/version.h>
#include <linux/ptrace.h>
#include <linux/hardirq.h>

[PATCH 6/82] remove linux/version.h include from arch/ppc

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

use system_utsname for CONFIG_BOOTX_TEXT welcome message

Signed-off-by: Olaf Hering <olh@suse.de>

arch/ppc/syslib/btext.c     |    6 ++++--
arch/ppc/syslib/prom.c      |    1 -
arch/ppc/syslib/prom_init.c |    1 -
3 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6.13-rc2-mm1/arch/ppc/syslib/btext.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc/syslib/btext.c
+++ linux-2.6.13-rc2-mm1/arch/ppc/syslib/btext.c
@@ -7,7 +7,7 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
+#include <linux/utsname.h>

#include <asm/sections.h>
#include <asm/bootx.h>
@@ -81,7 +81,9 @@ btext_welcome(void)
unsigned long pvr;
boot_infos_t* bi = &disp_bi;

-	btext_drawstring("Welcome to Linux, kernel " UTS_RELEASE "n");
+	btext_drawstring("Welcome to Linux, kernel ");
+	btext_drawstring(system_utsname.version);
+	btext_drawstring("n");
btext_drawstring("nlinked at        : 0x");
btext_drawhex(KERNELBASE);
btext_drawstring("nframe buffer at  : 0x");
Index: linux-2.6.13-rc2-mm1/arch/ppc/syslib/prom.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc/syslib/prom.c
+++ linux-2.6.13-rc2-mm1/arch/ppc/syslib/prom.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/threads.h>
#include <linux/spinlock.h>
#include <linux/ioport.h>
Index: linux-2.6.13-rc2-mm1/arch/ppc/syslib/prom_init.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc/syslib/prom_init.c
+++ linux-2.6.13-rc2-mm1/arch/ppc/syslib/prom_init.c
@@ -9,7 +9,6 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/threads.h>
#include <linux/spinlock.h>
#include <linux/ioport.h>

[PATCH 7/82] remove linux/version.h include from arch/ppc64

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

use system_utsname for progress and debug header


Signed-off-by: Olaf Hering <olh@suse.de>

arch/ppc64/kernel/btext.c         |    1 -
arch/ppc64/kernel/pSeries_setup.c |    4 ++--
arch/ppc64/kernel/prom.c          |    1 -
arch/ppc64/kernel/prom_init.c     |    1 -
arch/ppc64/kernel/setup.c         |    4 ++--
arch/ppc64/kernel/vio.c           |    1 -
6 files changed, 4 insertions(+), 8 deletions(-)

Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/btext.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/btext.c
+++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/btext.c
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>

#include <asm/sections.h>
#include <asm/prom.h>
Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/pSeries_setup.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/pSeries_setup.c
+++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/pSeries_setup.c
@@ -37,7 +37,7 @@
#include <linux/ioport.h>
#include <linux/console.h>
#include <linux/pci.h>
-#include <linux/version.h>
+#include <linux/utsname.h>
#include <linux/adb.h>
#include <linux/module.h>
#include <linux/delay.h>
@@ -253,7 +253,7 @@ static int __init pSeries_init_panel(voi
{
/* Manually leave the kernel version on the panel. */
ppc_md.progress("Linux ppc64n", 0);
-	ppc_md.progress(UTS_RELEASE, 0);
+	ppc_md.progress(system_utsname.version, 0);

return 0;
}
Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/prom.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/prom.c
+++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/prom.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/threads.h>
#include <linux/spinlock.h>
#include <linux/types.h>
Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/prom_init.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/prom_init.c
+++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/prom_init.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/threads.h>
#include <linux/spinlock.h>
#include <linux/types.h>
Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/setup.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/setup.c
+++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/setup.c
@@ -25,7 +25,7 @@
#include <linux/seq_file.h>
#include <linux/ioport.h>
#include <linux/console.h>
-#include <linux/version.h>
+#include <linux/utsname.h>
#include <linux/tty.h>
#include <linux/root_dev.h>
#include <linux/notifier.h>
@@ -653,7 +653,7 @@ void __init setup_system(void)
smp_release_cpus();
#endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */

-	printk("Starting Linux PPC64 %sn", UTS_RELEASE);
+	printk("Starting Linux PPC64 %sn", system_utsname.version);

printk("-----------------------------------------------------n");
printk("ppc64_pft_size                = 0x%lxn", ppc64_pft_size);
Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/vio.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/vio.c
+++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/vio.c
@@ -14,7 +14,6 @@

#include <linux/init.h>
#include <linux/console.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kobject.h>
#include <linux/mm.h>

[PATCH 8/82] remove linux/version.h include from drivers/atm/he.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/atm/he.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/atm/he.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/atm/he.c
+++ linux-2.6.13-rc2-mm1/drivers/atm/he.c
@@ -57,7 +57,6 @@

#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/pci.h>

[PATCH 9/82] remove linux/version.h from drivers/block/amiflop.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/block/amiflop.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/block/amiflop.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/block/amiflop.c
+++ linux-2.6.13-rc2-mm1/drivers/block/amiflop.c
@@ -1816,7 +1816,6 @@ out_blkdev:
}

#ifdef MODULE
-#include <linux/version.h>

int init_module(void)
{

[PATCH 10/82] remove linux/version.h from drivers/char/ip2.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/char/ip2.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/char/ip2.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/ip2.c
+++ linux-2.6.13-rc2-mm1/drivers/char/ip2.c
@@ -7,7 +7,6 @@
//

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/wait.h>

[PATCH 11/82] remove linux/version.h from drivers/char/mwave/tp3780i.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/char/mwave/tp3780i.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/char/mwave/tp3780i.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/mwave/tp3780i.c
+++ linux-2.6.13-rc2-mm1/drivers/char/mwave/tp3780i.c
@@ -46,7 +46,6 @@
*	First release to the public
*/

-#include <linux/version.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/ptrace.h>

[PATCH 12/82] remove linux/version.h from drivers/char/mxser.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.


Signed-off-by: Olaf Hering <olh@suse.de>

drivers/char/mxser.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/char/mxser.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/mxser.c
+++ linux-2.6.13-rc2-mm1/drivers/char/mxser.c
@@ -38,7 +38,6 @@

#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/autoconf.h>
#include <linux/errno.h>
#include <linux/signal.h>

[PATCH 13/82] remove linux/version.h from drivers/char/speakup/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

remove code for obsolete kernel versions

Signed-off-by: Olaf Hering <olh@suse.de>
drivers/char/speakup/genmap.c            |    3 +--
drivers/char/speakup/makemapdata.c       |    1 -
drivers/char/speakup/mod_code.c          |    3 ---
drivers/char/speakup/speakup.c           |   26 --------------------------
drivers/char/speakup/speakup_drvcommon.c |    3 ---
drivers/char/speakup/speakup_keyhelp.c   |    7 -------
drivers/char/speakup/spk_priv.h          |    6 ------
include/linux/speakup.h                  |    2 --
8 files changed, 1 insertion(+), 50 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/char/speakup/genmap.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/speakup/genmap.c
+++ linux-2.6.13-rc2-mm1/drivers/char/speakup/genmap.c
@@ -2,7 +2,6 @@
#include <stdio.h>
#include <libgen.h>
#include <string.h>
-#include <linux/version.h>
#include <ctype.h>

int get_define(void);
@@ -42,7 +41,7 @@ void open_input( char *name )
{
strcpy( filename, name );
if ( ( infile = fopen( filename, "r" ) ) == 0 ) {
-		fprintf( stderr, "can't open %s, version %dn", filename, LINUX_VERSION_CODE );
+		fprintf( stderr, "can't open %sn", filename);
exit( 1 );
}
lc = 0;
Index: linux-2.6.13-rc2-mm1/drivers/char/speakup/makemapdata.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/speakup/makemapdata.c
+++ linux-2.6.13-rc2-mm1/drivers/char/speakup/makemapdata.c
@@ -2,7 +2,6 @@
#include <stdio.h>
#include <libgen.h>
#include <string.h>
-#include <linux/version.h>
#include <ctype.h>

int get_define(void);
Index: linux-2.6.13-rc2-mm1/drivers/char/speakup/mod_code.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/speakup/mod_code.c
+++ linux-2.6.13-rc2-mm1/drivers/char/speakup/mod_code.c
@@ -12,9 +12,6 @@ static int __init mod_synth_init( void )
int status = do_synth_init( &MY_SYNTH );
if ( status != 0 ) return status;
synth_add( &MY_SYNTH );
-#if (LINUX_VERSION_CODE < 132419)
-//          MOD_INC_USE_COUNT;
-#endif
return 0;
}

Index: linux-2.6.13-rc2-mm1/drivers/char/speakup/speakup.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/speakup/speakup.c
+++ linux-2.6.13-rc2-mm1/drivers/char/speakup/speakup.c
@@ -25,16 +25,10 @@
#define __KERNEL_SYSCALLS__

#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/vt.h>
#include <linux/tty.h>
#include <linux/mm.h> /* __get_free_page( ) and friends */
#include <linux/vt_kern.h>
-#if (LINUX_VERSION_CODE < 132419)
-#include <linux/console_struct.h>
-#include <linux/kbd_ll.h>
-#include <asm/keyboard.h>
-#endif
#include <linux/ctype.h>
#include <linux/selection.h>
#include <asm/uaccess.h> /* copy_from|to|user( ) and others */
@@ -109,19 +103,12 @@ static u_char key_defaults[] = {
#include "speakupmap.h"
};

-#if (LINUX_VERSION_CODE < 132419)
-extern struct tty_struct *tty;
-typedef void (*k_handler_fn)(unsigned char value, char up_flag);
-#define KBD_PROTO u_char value, char up_flag
-#define KBD_ARGS value, up_flag
-#else
struct tty_struct *tty;
#define key_handler k_handler
typedef void (*k_handler_fn)(struct vc_data *vc, unsigned char value,
char up_flag, struct pt_regs *regs);
#define KBD_PROTO struct vc_data *vc, u_char value, char up_flag, struct pt_regs *regs
#define KBD_ARGS vc, value, up_flag, regs
-#endif
extern k_handler_fn key_handler[16];
static k_handler_fn do_shift, do_spec, do_latin, do_cursor;
EXPORT_SYMBOL( help_handler );
@@ -1293,9 +1280,7 @@ void __init speakup_open (struct vc_data
speakup_date( vc);
pr_info ("%s: initializedn", SPEAKUP_VERSION );
init_timer (&cursor_timer );
-#if (LINUX_VERSION_CODE >= 132419)
cursor_timer.entry.prev=NULL;
-#endif
cursor_timer.function = cursor_done;
init_sleeper ( synth_sleeping_list );
strlwr (synth_name );
@@ -2088,13 +2073,8 @@ load_help ( void *dummy )
} else synth_write_string( "help module not found" );
}

-#if (LINUX_VERSION_CODE >= 132419)
static DECLARE_WORK(ld_help, load_help, NULL);
#define schedule_help schedule_work
-#else
-static struct tq_struct ld_help = { routine: load_help, };
-#define schedule_help schedule_task
-#endif

static void
speakup_help (struct vc_data *vc )
@@ -2161,18 +2141,12 @@ void do_spkup( struct vc_data *vc,u_char
static const char *pad_chars = "0123456789+-*/015,.?()";

int
-#if (LINUX_VERSION_CODE < 132419)
-speakup_key ( int shift_state, u_char keycode, u_short keysym, u_char up_flag )
-#else
speakup_key (struct vc_data *vc, int shift_state, int keycode, u_short keysym, int up_flag, struct pt_regs *regs )
-#endif
{
u_char *key_info;
u_char type = KTYP( keysym ), value = KVAL( keysym ), new_key = 0;
u_char shift_info, offset;
-#if (LINUX_VERSION_CODE >= 132419)
tty = vc->vc_tty;
-#endif
if ( synth == NULL ) return 0;
if ( type >= 0xf0 ) type -= 0xf0;
if ( type == KT_PAD && (vc_kbd_led(kbd , VC_NUMLOCK ) ) ) {
Index: linux-2.6.13-rc2-mm1/drivers/char/speakup/speakup_drvcommon.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/speakup/speakup_drvcommon.c
+++ linux-2.6.13-rc2-mm1/drivers/char/speakup/speakup_drvcommon.c
@@ -1,6 +1,5 @@
#define KERNEL
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/ctype.h>	/* for isdigit( ) and friends */
#include <linux/fs.h>
@@ -304,9 +303,7 @@ int do_synth_init ( struct spk_synth *in
synth_time_vars[2].default_val = synth->jiffies;
synth_time_vars[3].default_val = synth->full;
synth_timer.function = synth->catch_up;
-#if (LINUX_VERSION_CODE >= 132419)
synth_timer.entry.prev = NULL;
-#endif
init_timer ( &synth_timer );
for ( n_var = synth_time_vars; n_var->var_id >= 0; n_var++ )
speakup_register_var( n_var );
Index: linux-2.6.13-rc2-mm1/drivers/char/speakup/speakup_keyhelp.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/speakup/speakup_keyhelp.c
+++ linux-2.6.13-rc2-mm1/drivers/char/speakup/speakup_keyhelp.c
@@ -20,7 +20,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

-#include <linux/version.h>
#include <linux/keyboard.h>
#include "spk_priv.h"

@@ -201,9 +200,6 @@ static int handle_help ( struct vc_data
if ( type == KT_LATIN ) {
if ( ch == SPACE ) {
special_handler = NULL;
-#if (LINUX_VERSION_CODE < 132419)
-			MOD_DEC_USE_COUNT;
-#endif
synth_write_msg( "leaving help" );
return 1;
}
@@ -224,9 +220,6 @@ static int handle_help ( struct vc_data
else return -1;
} else if (type == KT_SPKUP && ch == SPEAKUP_HELP && !special_handler) {
special_handler = help_handler;
-#if (LINUX_VERSION_CODE < 132419)
-		MOD_INC_USE_COUNT;
-#endif
synth_write_msg( help_info );
build_key_data( ); /* rebuild each time in case new mapping */
return 1;
Index: linux-2.6.13-rc2-mm1/drivers/char/speakup/spk_priv.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/speakup/spk_priv.h
+++ linux-2.6.13-rc2-mm1/drivers/char/speakup/spk_priv.h
@@ -25,7 +25,6 @@
#define __SPEAKUP_PRIVATE_H

#define KERNEL
-#include <linux/version.h>
#include <linux/config.h>
#include <linux/types.h>
#include <linux/fs.h>
@@ -209,13 +208,8 @@ void spk_serial_release( void );
extern int synth_port_tts, synth_port_forced;
extern volatile int synth_timer_active;
#define declare_timer( name ) struct timer_list name;
-#if (LINUX_VERSION_CODE >= 132419)
#define start_timer( name ) if ( ! name.entry.prev ) add_timer ( & name )
#define stop_timer( name ) del_timer ( & name ); name.entry.prev = NULL
-#else
-#define start_timer( name ) if ( ! name.list.prev ) add_timer ( & name )
-#define stop_timer( name ) del_timer ( & name )
-#endif
#define declare_sleeper( name ) wait_queue_head_t name
#define init_sleeper( name ) 	init_waitqueue_head ( &name )
extern declare_sleeper( synth_sleeping_list );
Index: linux-2.6.13-rc2-mm1/include/linux/speakup.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/speakup.h
+++ linux-2.6.13-rc2-mm1/include/linux/speakup.h
@@ -1,8 +1,6 @@
#ifndef __SPEAKUP_H
#define __SPEAKUP_H

-#include <linux/version.h>
-
struct kbd_struct;
struct vc_data;

[PATCH 14/82] remove linux/version.h from drivers/char/specialix.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/char/specialix.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/char/specialix.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/specialix.c
+++ linux-2.6.13-rc2-mm1/drivers/char/specialix.c
@@ -90,7 +90,6 @@
#include <linux/fcntl.h>
#include <linux/major.h>
#include <linux/delay.h>
-#include <linux/version.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <asm/uaccess.h>

[PATCH 15/82] remove linux/version.h from drivers/char/tpm/tpm.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/char/tpm/tpm.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/char/tpm/tpm.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/tpm/tpm.h
+++ linux-2.6.13-rc2-mm1/drivers/char/tpm/tpm.h
@@ -19,7 +19,6 @@
*
*/
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/fs.h>

[PATCH 16/82] remove linux/version.h from drivers/char/viocons.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/char/viocons.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/char/viocons.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/viocons.c
+++ linux-2.6.13-rc2-mm1/drivers/char/viocons.c
@@ -26,7 +26,6 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/proc_fs.h>
#include <linux/errno.h>

[PATCH 17/82] remove linux/version.h from drivers/char/viotape.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/char/viotape.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/char/viotape.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/char/viotape.c
+++ linux-2.6.13-rc2-mm1/drivers/char/viotape.c
@@ -32,7 +32,6 @@
* iSeries/vio.h
*/
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>

[PATCH 18/82] remove linux/version.h from drivers/infiniband/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/infiniband/core/cache.c           |    1 -
drivers/infiniband/hw/mthca/mthca_main.c  |    1 -
drivers/infiniband/ulp/ipoib/ipoib_main.c |    1 -
drivers/infiniband/ulp/ipoib/ipoib_vlan.c |    1 -
4 files changed, 4 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/infiniband/core/cache.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/infiniband/core/cache.c
+++ linux-2.6.13-rc2-mm1/drivers/infiniband/core/cache.c
@@ -32,7 +32,6 @@
* $Id: cache.c 1349 2004-12-16 21:09:43Z roland $
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/infiniband/hw/mthca/mthca_main.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/infiniband/hw/mthca/mthca_main.c
+++ linux-2.6.13-rc2-mm1/drivers/infiniband/hw/mthca/mthca_main.c
@@ -34,7 +34,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>
Index: linux-2.6.13-rc2-mm1/drivers/infiniband/ulp/ipoib/ipoib_main.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ linux-2.6.13-rc2-mm1/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -34,7 +34,6 @@

#include "ipoib.h"

-#include <linux/version.h>
#include <linux/module.h>

#include <linux/init.h>
Index: linux-2.6.13-rc2-mm1/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ linux-2.6.13-rc2-mm1/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -32,7 +32,6 @@
* $Id: ipoib_vlan.c 1349 2004-12-16 21:09:43Z roland $
*/

-#include <linux/version.h>
#include <linux/module.h>

#include <linux/init.h>

[PATCH 19/82] remove linux/version.h from drivers/isdn

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/isdn/divert/divert_init.c   |    1 -
drivers/isdn/divert/divert_procfs.c |    1 -
drivers/isdn/divert/isdn_divert.c   |    1 -
drivers/isdn/hisax/hisax_fcpcipnp.c |    1 -
drivers/isdn/hisax/st5481_init.c    |    1 -
drivers/isdn/hysdn/hycapi.c         |    1 -
drivers/isdn/hysdn/hysdn_init.c     |    1 -
drivers/isdn/hysdn/hysdn_net.c      |    1 -
drivers/isdn/hysdn/hysdn_procconf.c |    1 -
drivers/isdn/hysdn/hysdn_proclog.c  |    1 -
drivers/isdn/i4l/isdn_common.c      |    1 -
drivers/isdn/icn/icn.h              |    1 -
drivers/isdn/isdnloop/isdnloop.h    |    1 -
drivers/isdn/sc/includes.h          |    1 -
14 files changed, 14 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/isdn/divert/divert_init.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/divert/divert_init.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/divert/divert_init.c
@@ -10,7 +10,6 @@
*/

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/kernel.h>

Index: linux-2.6.13-rc2-mm1/drivers/isdn/divert/divert_procfs.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/divert/divert_procfs.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/divert/divert_procfs.c
@@ -11,7 +11,6 @@

#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/poll.h>
#include <linux/smp_lock.h>
#ifdef CONFIG_PROC_FS
Index: linux-2.6.13-rc2-mm1/drivers/isdn/divert/isdn_divert.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/divert/isdn_divert.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/divert/isdn_divert.c
@@ -9,7 +9,6 @@
*
*/

-#include <linux/version.h>
#include <linux/proc_fs.h>

#include "isdn_divert.h"
Index: linux-2.6.13-rc2-mm1/drivers/isdn/hisax/hisax_fcpcipnp.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -23,7 +23,6 @@
* o tx_skb at PH_DEACTIVATE time
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/pci.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/hisax/st5481_init.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/hisax/st5481_init.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/hisax/st5481_init.c
@@ -25,7 +25,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hycapi.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/hysdn/hycapi.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hycapi.c
@@ -11,7 +11,6 @@
*/

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/signal.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hysdn_init.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/hysdn/hysdn_init.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hysdn_init.c
@@ -13,7 +13,6 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/poll.h>
#include <linux/vmalloc.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hysdn_net.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/hysdn/hysdn_net.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hysdn_net.c
@@ -14,7 +14,6 @@
*/

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/signal.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hysdn_procconf.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/hysdn/hysdn_procconf.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hysdn_procconf.c
@@ -12,7 +12,6 @@
*/

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/poll.h>
#include <linux/proc_fs.h>
#include <linux/pci.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hysdn_proclog.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/hysdn/hysdn_proclog.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/hysdn/hysdn_proclog.c
@@ -11,7 +11,6 @@
*/

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/poll.h>
#include <linux/proc_fs.h>
#include <linux/pci.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/i4l/isdn_common.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/i4l/isdn_common.c
+++ linux-2.6.13-rc2-mm1/drivers/isdn/i4l/isdn_common.c
@@ -14,7 +14,6 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/poll.h>
#include <linux/vmalloc.h>
#include <linux/isdn.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/icn/icn.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/icn/icn.h
+++ linux-2.6.13-rc2-mm1/drivers/isdn/icn/icn.h
@@ -35,7 +35,6 @@ typedef struct icn_cdef {
#ifdef __KERNEL__
/* Kernel includes */

-#include <linux/version.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/major.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/isdnloop/isdnloop.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/isdnloop/isdnloop.h
+++ linux-2.6.13-rc2-mm1/drivers/isdn/isdnloop/isdnloop.h
@@ -33,7 +33,6 @@ typedef struct isdnloop_sdef {
#ifdef __KERNEL__
/* Kernel includes */

-#include <linux/version.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/major.h>
Index: linux-2.6.13-rc2-mm1/drivers/isdn/sc/includes.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/isdn/sc/includes.h
+++ linux-2.6.13-rc2-mm1/drivers/isdn/sc/includes.h
@@ -4,7 +4,6 @@
*
*/

-#include <linux/version.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <linux/delay.h>

[PATCH 20/82] remove linux/version.h from drivers/md/bitmap.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/md/bitmap.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/md/bitmap.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/md/bitmap.c
+++ linux-2.6.13-rc2-mm1/drivers/md/bitmap.c
@@ -21,7 +21,6 @@
*/

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/init.h>

[PATCH 21/82] remove linux/version.h from drivers/media/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

remove code for obsolete kernels, drivers/media/video/bttvp.h has:
#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,15)

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/media/common/saa7146_fops.c     |    1 -
drivers/media/common/saa7146_i2c.c      |    5 -----
drivers/media/dvb/cinergyT2/cinergyT2.c |    1 -
drivers/media/dvb/dvb-core/dvb_net.c    |    5 -----
drivers/media/dvb/frontends/dib3000mb.c |    1 -
drivers/media/dvb/frontends/dib3000mc.c |    1 -
drivers/media/video/arv.c               |    1 -
drivers/media/video/bttv-cards.c        |   15 ---------------
drivers/media/video/zr36016.c           |    1 -
drivers/media/video/zr36050.c           |    1 -
drivers/media/video/zr36060.c           |    1 -
include/media/ir-common.h               |    1 -
include/media/saa7146.h                 |   10 ----------
13 files changed, 44 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/media/common/saa7146_fops.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/common/saa7146_fops.c
+++ linux-2.6.13-rc2-mm1/drivers/media/common/saa7146_fops.c
@@ -1,5 +1,4 @@
#include <media/saa7146_vv.h>
-#include <linux/version.h>

#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1)

Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/cinergyT2/cinergyT2.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -25,7 +25,6 @@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/pci.h>
Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/dvb-core/dvb_net.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/dvb-core/dvb_net.c
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/dvb-core/dvb_net.c
@@ -62,7 +62,6 @@
#include <linux/uio.h>
#include <asm/uaccess.h>
#include <linux/crc32.h>
-#include <linux/version.h>

#include "dvb_demux.h"
#include "dvb_net.h"
@@ -171,11 +170,7 @@ static unsigned short dvb_net_eth_type_t

skb->mac.raw=skb->data;
skb_pull(skb,dev->hard_header_len);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8)
-	eth = skb->mac.ethernet;
-#else
eth = eth_hdr(skb);
-#endif

if (*eth->h_dest & 1) {
if(memcmp(eth->h_dest,dev->broadcast, ETH_ALEN)==0)
Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/frontends/dib3000mb.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/frontends/dib3000mb.c
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/frontends/dib3000mb.c
@@ -23,7 +23,6 @@

#include <linux/config.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/frontends/dib3000mc.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/frontends/dib3000mc.c
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/frontends/dib3000mc.c
@@ -22,7 +22,6 @@
*/
#include <linux/config.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
Index: linux-2.6.13-rc2-mm1/drivers/media/video/arv.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/arv.c
+++ linux-2.6.13-rc2-mm1/drivers/media/video/arv.c
@@ -22,7 +22,6 @@
#include <linux/init.h>
#include <linux/devfs_fs_kernel.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/fs.h>
Index: linux-2.6.13-rc2-mm1/drivers/media/video/bttv-cards.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/bttv-cards.c
+++ linux-2.6.13-rc2-mm1/drivers/media/video/bttv-cards.c
@@ -3656,13 +3656,8 @@ gvbctv5pci_audio(struct bttv *btv, struc
{
unsigned int val, con;

-#if BTTV_VERSION_CODE > KERNEL_VERSION(0,8,0)
if (btv->radio_user)
return;
-#else
-	if (btv->radio)
-		return;
-#endif

val = gpio_read();
if (set) {
@@ -3851,13 +3846,8 @@ pvbt878p9b_audio(struct bttv *btv, struc
{
unsigned int val = 0;

-#if BTTV_VERSION_CODE > KERNEL_VERSION(0,8,0)
if (btv->radio_user)
return;
-#else
-	if (btv->radio)
-		return;
-#endif

if (set) {
if (v->mode & VIDEO_SOUND_MONO)	{
@@ -3888,13 +3878,8 @@ fv2000s_audio(struct bttv *btv, struct v
{
unsigned int val = 0xffff;

-#if BTTV_VERSION_CODE > KERNEL_VERSION(0,8,0)
if (btv->radio_user)
return;
-#else
-	if (btv->radio)
-		return;
-#endif
if (set) {
if (v->mode & VIDEO_SOUND_MONO)	{
val = 0x0000;
Index: linux-2.6.13-rc2-mm1/drivers/media/video/zr36016.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/zr36016.c
+++ linux-2.6.13-rc2-mm1/drivers/media/video/zr36016.c
@@ -26,7 +26,6 @@

#define ZR016_VERSION "v0.7"

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/media/video/zr36050.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/zr36050.c
+++ linux-2.6.13-rc2-mm1/drivers/media/video/zr36050.c
@@ -26,7 +26,6 @@

#define ZR050_VERSION "v0.7.1"

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/media/video/zr36060.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/zr36060.c
+++ linux-2.6.13-rc2-mm1/drivers/media/video/zr36060.c
@@ -26,7 +26,6 @@

#define ZR060_VERSION "v0.7"

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/include/media/ir-common.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/media/ir-common.h
+++ linux-2.6.13-rc2-mm1/include/media/ir-common.h
@@ -21,7 +21,6 @@
*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

-#include <linux/version.h>
#include <linux/input.h>


Index: linux-2.6.13-rc2-mm1/include/media/saa7146.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/media/saa7146.h
+++ linux-2.6.13-rc2-mm1/include/media/saa7146.h
@@ -15,11 +15,6 @@
#include <linux/vmalloc.h>	/* for vmalloc() */
#include <linux/mm.h>		/* for vmalloc_to_page() */

-/* ugly, but necessary to build the dvb stuff under 2.4. */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#include "dvb_functions.h"
-#endif
-
#define SAA7146_VERSION_CODE KERNEL_VERSION(0,5,0)

#define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
@@ -33,13 +28,8 @@ extern unsigned int saa7146_debug;
#define DEBUG_VARIABLE saa7146_debug
#endif

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-#define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_BASENAME),__FUNCTION__)
-#define INFO(x) { printk("%s: ",__stringify(KBUILD_BASENAME)); printk x; }
-#else
#define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__)
#define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; }
-#endif

#define ERR(x) { DEBUG_PROLOG; printk x; }

Index: linux-2.6.13-rc2-mm1/drivers/media/common/saa7146_i2c.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/common/saa7146_i2c.c
+++ linux-2.6.13-rc2-mm1/drivers/media/common/saa7146_i2c.c
@@ -1,4 +1,3 @@
-#include <linux/version.h>
#include <media/saa7146_vv.h>

static u32 saa7146_i2c_func(struct i2c_adapter *adapter)
@@ -404,12 +403,8 @@ int saa7146_i2c_adapter_prepare(struct s
saa7146_i2c_reset(dev);

if( NULL != i2c_adapter ) {
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-		i2c_adapter->data = dev;
-#else
BUG_ON(!i2c_adapter->class);
i2c_set_adapdata(i2c_adapter,dev);
-#endif
i2c_adapter->algo	   = &saa7146_algo;
i2c_adapter->algo_data     = NULL;
i2c_adapter->id		   = I2C_ALGO_SAA7146;

[PATCH 22/82] remove linux/version.h from drivers/message/fusion

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

remove also drivers/message/fusion/linux_compat.h,
because it is empty after the change

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/message/fusion/linux_compat.h |   18 ------------------
drivers/message/fusion/mptbase.c      |    1 -
drivers/message/fusion/mptbase.h      |    1 -
drivers/message/fusion/mptctl.c       |    1 -
drivers/message/fusion/mptctl.h       |    1 -
drivers/message/fusion/mptfc.c        |    1 -
drivers/message/fusion/mptlan.h       |    1 -
drivers/message/fusion/mptscsih.c     |    1 -
drivers/message/fusion/mptspi.c       |    1 -
9 files changed, 26 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/linux_compat.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/linux_compat.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* drivers/message/fusion/linux_compat.h */
-
-#ifndef FUSION_LINUX_COMPAT_H
-#define FUSION_LINUX_COMPAT_H
-
-#include <linux/version.h>
-#include <scsi/scsi_device.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,6))
-static int inline scsi_device_online(struct scsi_device *sdev)
-{
-	return sdev->online;
-}
-#endif
-
-
-/*}-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-#endif /* _LINUX_COMPAT_H */
Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/mptbase.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/mptbase.c
+++ linux-2.6.13-rc2-mm1/drivers/message/fusion/mptbase.c
@@ -47,7 +47,6 @@
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/mptbase.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/mptbase.h
+++ linux-2.6.13-rc2-mm1/drivers/message/fusion/mptbase.h
@@ -49,7 +49,6 @@
#define MPTBASE_H_INCLUDED
/*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

-#include <linux/version.h>
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/pci.h>
Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/mptctl.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/mptctl.c
+++ linux-2.6.13-rc2-mm1/drivers/message/fusion/mptctl.c
@@ -45,7 +45,6 @@
*/
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/mptctl.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/mptctl.h
+++ linux-2.6.13-rc2-mm1/drivers/message/fusion/mptctl.h
@@ -49,7 +49,6 @@
#define MPTCTL_H_INCLUDED
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

-#include "linux/version.h"


/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/mptlan.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/mptlan.h
+++ linux-2.6.13-rc2-mm1/drivers/message/fusion/mptlan.h
@@ -66,7 +66,6 @@
#include <linux/slab.h>
#include <linux/miscdevice.h>
#include <linux/spinlock.h>
-#include <linux/version.h>
#include <linux/workqueue.h>
#include <linux/delay.h>
// #include <linux/trdevice.h>
Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/mptfc.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/mptfc.c
+++ linux-2.6.13-rc2-mm1/drivers/message/fusion/mptfc.c
@@ -43,7 +43,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-#include "linux_compat.h"	/* linux-2.6 tweaks */
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/mptscsih.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/mptscsih.c
+++ linux-2.6.13-rc2-mm1/drivers/message/fusion/mptscsih.c
@@ -44,7 +44,6 @@
*/
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

-#include "linux_compat.h"	/* linux-2.6 tweaks */
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
Index: linux-2.6.13-rc2-mm1/drivers/message/fusion/mptspi.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/message/fusion/mptspi.c
+++ linux-2.6.13-rc2-mm1/drivers/message/fusion/mptspi.c
@@ -44,7 +44,6 @@
*/
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

-#include "linux_compat.h"	/* linux-2.6 tweaks */
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>

[PATCH 23/82] remove linux/version.h from drivers/misc/hdpuftrs/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/misc/hdpuftrs/hdpu_cpustate.c |    1 -
drivers/misc/hdpuftrs/hdpu_nexus.c    |    1 -
2 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/misc/hdpuftrs/hdpu_cpustate.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ linux-2.6.13-rc2-mm1/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -14,7 +14,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
Index: linux-2.6.13-rc2-mm1/drivers/misc/hdpuftrs/hdpu_nexus.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ linux-2.6.13-rc2-mm1/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -14,7 +14,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/proc_fs.h>

[PATCH 24/82] remove linux/version.h from drivers/misc/ibmasm/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/misc/ibmasm/ibmasm.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/misc/ibmasm/ibmasm.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/misc/ibmasm/ibmasm.h
+++ linux-2.6.13-rc2-mm1/drivers/misc/ibmasm/ibmasm.h
@@ -31,7 +31,6 @@
#include <linux/slab.h>
#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include <linux/input.h>

[PATCH 25/82] remove linux/version.h from drivers/mtd

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code from obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/mtd/chips/cfi_cmdset_0020.c |    1 -
drivers/mtd/devices/pmc551.c        |    1 -
drivers/mtd/maps/ebony.c            |    1 -
drivers/mtd/maps/ocotea.c           |    1 -
drivers/mtd/maps/walnut.c           |    1 -
drivers/mtd/nand/au1550nd.c         |   10 ----------
drivers/mtd/nand/autcpu12.c         |    1 -
include/linux/mtd/cfi.h             |    1 -
include/linux/mtd/mtd.h             |    1 -
9 files changed, 18 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/mtd/chips/cfi_cmdset_0020.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/mtd/chips/cfi_cmdset_0020.c
+++ linux-2.6.13-rc2-mm1/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -18,7 +18,6 @@
*	- added a writev function
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
Index: linux-2.6.13-rc2-mm1/drivers/mtd/devices/pmc551.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/mtd/devices/pmc551.c
+++ linux-2.6.13-rc2-mm1/drivers/mtd/devices/pmc551.c
@@ -82,7 +82,6 @@
*       * Comb the init routine.  It's still a bit cludgy on a few things.
*/

-#include <linux/version.h>
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
Index: linux-2.6.13-rc2-mm1/drivers/mtd/maps/ebony.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/mtd/maps/ebony.c
+++ linux-2.6.13-rc2-mm1/drivers/mtd/maps/ebony.c
@@ -21,7 +21,6 @@
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/config.h>
-#include <linux/version.h>
#include <asm/io.h>
#include <asm/ibm44x.h>
#include <platforms/4xx/ebony.h>
Index: linux-2.6.13-rc2-mm1/drivers/mtd/maps/ocotea.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/mtd/maps/ocotea.c
+++ linux-2.6.13-rc2-mm1/drivers/mtd/maps/ocotea.c
@@ -19,7 +19,6 @@
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/config.h>
-#include <linux/version.h>
#include <asm/io.h>
#include <asm/ibm44x.h>
#include <platforms/4xx/ocotea.h>
Index: linux-2.6.13-rc2-mm1/drivers/mtd/maps/walnut.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/mtd/maps/walnut.c
+++ linux-2.6.13-rc2-mm1/drivers/mtd/maps/walnut.c
@@ -21,7 +21,6 @@
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/config.h>
-#include <linux/version.h>
#include <asm/io.h>
#include <asm/ibm4xx.h>
#include <platforms/4xx/walnut.h>
Index: linux-2.6.13-rc2-mm1/drivers/mtd/nand/au1550nd.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/mtd/nand/au1550nd.c
+++ linux-2.6.13-rc2-mm1/drivers/mtd/nand/au1550nd.c
@@ -20,7 +20,6 @@
#include <asm/io.h>

/* fixme: this is ugly */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
#include <asm/mach-au1x00/au1000.h>
#ifdef CONFIG_MIPS_PB1550
#include <asm/mach-pb1x00/pb1550.h>
@@ -28,15 +27,6 @@
#ifdef CONFIG_MIPS_DB1550
#include <asm/mach-db1x00/db1x00.h>
#endif
-#else
-#include <asm/au1000.h>
-#ifdef CONFIG_MIPS_PB1550
-#include <asm/pb1550.h>
-#endif
-#ifdef CONFIG_MIPS_DB1550
-#include <asm/db1x00.h>
-#endif
-#endif

/*
* MTD structure for NAND controller
Index: linux-2.6.13-rc2-mm1/drivers/mtd/nand/autcpu12.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/mtd/nand/autcpu12.c
+++ linux-2.6.13-rc2-mm1/drivers/mtd/nand/autcpu12.c
@@ -27,7 +27,6 @@
*	10-06-2002 TG	128K card support added
*/

-#include <linux/version.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/module.h>
Index: linux-2.6.13-rc2-mm1/include/linux/mtd/cfi.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/mtd/cfi.h
+++ linux-2.6.13-rc2-mm1/include/linux/mtd/cfi.h
@@ -8,7 +8,6 @@
#define __MTD_CFI_H__

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/interrupt.h>
Index: linux-2.6.13-rc2-mm1/include/linux/mtd/mtd.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/mtd/mtd.h
+++ linux-2.6.13-rc2-mm1/include/linux/mtd/mtd.h
@@ -14,7 +14,6 @@
#endif

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/uio.h>

[PATCH 26/82] remove linux/version.h from drivers/net/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

remove code for obsolete kernels in acenic, irda, tokenring, typhoon
and wireless.
drivers/net/wan/farsync.c  has fstioc_info->kernelVersion,
according to the comment the content doesnt matter

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/net/acenic.c                            |   11 ----
drivers/net/acenic.h                            |    4 -
drivers/net/b44.c                               |    1
drivers/net/dm9000.c                            |    1
drivers/net/gianfar.c                           |    1
drivers/net/gianfar.h                           |    1
drivers/net/gianfar_ethtool.c                   |    1
drivers/net/gianfar_phy.c                       |    1
drivers/net/hp100.c                             |    1
drivers/net/ibmveth.c                           |    1
drivers/net/irda/sir_kthread.c                  |    4 -
drivers/net/irda/vlsi_ir.h                      |   22 --------
drivers/net/iseries_veth.c                      |    1
drivers/net/mac8390.c                           |    1
drivers/net/mv643xx_eth.h                       |    1
drivers/net/ppp_mppe.c                          |    1
drivers/net/s2io.c                              |    1
drivers/net/sk98lin/h/skdrv1st.h                |    3 -
drivers/net/sk_mca.c                            |    1
drivers/net/sk_mca.h                            |    2
drivers/net/starfire.c                          |    3 -
drivers/net/tokenring/lanstreamer.c             |   59 ------------------------
drivers/net/tokenring/lanstreamer.h             |   14 -----
drivers/net/typhoon.c                           |    9 ---
drivers/net/via-velocity.c                      |    1
drivers/net/wan/farsync.c                       |    2
drivers/net/wireless/hostap/hostap.c            |    1
drivers/net/wireless/hostap/hostap_crypt_ccmp.c |    1
drivers/net/wireless/hostap/hostap_crypt_tkip.c |    1
drivers/net/wireless/hostap/hostap_crypt_wep.c  |    1
drivers/net/wireless/hostap/hostap_cs.c         |    1
drivers/net/wireless/hostap/hostap_hw.c         |    1
drivers/net/wireless/hostap/hostap_pci.c        |    1
drivers/net/wireless/hostap/hostap_plx.c        |    1
drivers/net/wireless/ipw2100.c                  |    1
drivers/net/wireless/ipw2100.h                  |    1
drivers/net/wireless/ipw2200.c                  |    8 ---
drivers/net/wireless/ipw2200.h                  |   10 ----
drivers/net/wireless/orinoco.h                  |    1
drivers/net/wireless/prism54/isl_38xx.c         |    1
drivers/net/wireless/prism54/isl_38xx.h         |    1
drivers/net/wireless/prism54/isl_ioctl.c        |    1
drivers/net/wireless/prism54/islpci_dev.c       |    1
drivers/net/wireless/prism54/islpci_dev.h       |    1
drivers/net/wireless/prism54/islpci_eth.c       |    1
drivers/net/wireless/prism54/islpci_hotplug.c   |    1
46 files changed, 5 insertions(+), 179 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/net/acenic.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/acenic.c
+++ linux-2.6.13-rc2-mm1/drivers/net/acenic.c
@@ -53,7 +53,6 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/ioport.h>
@@ -164,12 +163,6 @@ MODULE_DEVICE_TABLE(pci, acenic_pci_tbl)
#define SET_NETDEV_DEV(net, pdev)	do{} while(0)
#endif

-#if LINUX_VERSION_CODE >= 0x2051c
-#define ace_sync_irq(irq)	synchronize_irq(irq)
-#else
-#define ace_sync_irq(irq)	synchronize_irq()
-#endif
-
#ifndef offset_in_page
#define offset_in_page(ptr)	((unsigned long)(ptr) & ~PAGE_MASK)
#endif
@@ -657,7 +650,7 @@ static void __devexit acenic_remove_one(
* Then release the RX buffers - jumbo buffers were
* already released in ace_close().
*/
-	ace_sync_irq(dev->irq);
+	synchronize_irq(dev->irq);

for (i = 0; i < RX_STD_RING_ENTRIES; i++) {
struct sk_buff *skb = ap->skb->rx_std_skbuff[i].skb;
@@ -2657,7 +2650,7 @@ static int ace_change_mtu(struct net_dev
}
} else {
while (test_and_set_bit(0, &ap->jumbo_refill_busy));
-		ace_sync_irq(dev->irq);
+		synchronize_irq(dev->irq);
ace_set_rxtx_parms(dev, 0);
if (ap->jumbo) {
struct cmd cmd;
Index: linux-2.6.13-rc2-mm1/drivers/net/acenic.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/acenic.h
+++ linux-2.6.13-rc2-mm1/drivers/net/acenic.h
@@ -1,8 +1,6 @@
#ifndef _ACENIC_H_
#define _ACENIC_H_

-#include <linux/config.h>
-
/*
* Generate TX index update each time, when TX ring is closed.
* Normally, this is not useful, because results in more dma (and irqs
@@ -747,7 +745,7 @@ static inline void ace_mask_irq(struct n
else
writel(readl(&regs->HostCtrl) | MASK_INTS, &regs->HostCtrl);

-	ace_sync_irq(dev->irq);
+	synchronize_irq(dev->irq);
}


Index: linux-2.6.13-rc2-mm1/drivers/net/b44.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/b44.c
+++ linux-2.6.13-rc2-mm1/drivers/net/b44.c
@@ -18,7 +18,6 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/init.h>
-#include <linux/version.h>

#include <asm/uaccess.h>
#include <asm/io.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/dm9000.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/dm9000.c
+++ linux-2.6.13-rc2-mm1/drivers/net/dm9000.c
@@ -56,7 +56,6 @@
#include <linux/etherdevice.h>
#include <linux/init.h>
#include <linux/skbuff.h>
-#include <linux/version.h>
#include <linux/spinlock.h>
#include <linux/crc32.h>
#include <linux/mii.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/gianfar.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/gianfar.c
+++ linux-2.6.13-rc2-mm1/drivers/net/gianfar.c
@@ -94,7 +94,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/dma-mapping.h>
#include <linux/crc32.h>

Index: linux-2.6.13-rc2-mm1/drivers/net/gianfar.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/gianfar.h
+++ linux-2.6.13-rc2-mm1/drivers/net/gianfar.h
@@ -43,7 +43,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/crc32.h>
#include <linux/workqueue.h>
#include <linux/ethtool.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/gianfar_ethtool.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/gianfar_ethtool.c
+++ linux-2.6.13-rc2-mm1/drivers/net/gianfar_ethtool.c
@@ -34,7 +34,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/crc32.h>
#include <asm/types.h>
#include <asm/uaccess.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/gianfar_phy.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/gianfar_phy.c
+++ linux-2.6.13-rc2-mm1/drivers/net/gianfar_phy.c
@@ -36,7 +36,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/crc32.h>
#include <linux/mii.h>

Index: linux-2.6.13-rc2-mm1/drivers/net/hp100.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/hp100.c
+++ linux-2.6.13-rc2-mm1/drivers/net/hp100.c
@@ -96,7 +96,6 @@

#undef HP100_MULTICAST_FILTER	/* Need to be debugged... */

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/ibmveth.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/ibmveth.c
+++ linux-2.6.13-rc2-mm1/drivers/net/ibmveth.c
@@ -35,7 +35,6 @@

#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/ioport.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/irda/sir_kthread.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/irda/sir_kthread.c
+++ linux-2.6.13-rc2-mm1/drivers/net/irda/sir_kthread.c
@@ -14,7 +14,6 @@

#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/completion.h>
@@ -140,9 +139,6 @@ static int irda_thread(void *startup)
run_irda_queue();
}

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,35)
-	reparent_to_init();
-#endif
complete_and_exit(&irda_rq_queue.exit, 0);
/* never reached */
return 0;
Index: linux-2.6.13-rc2-mm1/drivers/net/irda/vlsi_ir.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/irda/vlsi_ir.h
+++ linux-2.6.13-rc2-mm1/drivers/net/irda/vlsi_ir.h
@@ -49,26 +49,6 @@ typedef void irqreturn_t;
#define IRQ_RETVAL(x)
#endif

-/* some stuff need to check kernelversion. Not all 2.5 stuff was present
- * in early 2.5.x - the test is merely to separate 2.4 from 2.5
- */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-/* PDE() introduced in 2.5.4 */
-#ifdef CONFIG_PROC_FS
-#define PDE(inode) ((inode)->u.generic_ip)
-#endif
-
-/* irda crc16 calculation exported in 2.5.42 */
-#define irda_calc_crc16(fcs,buf,len)	(GOOD_FCS)
-
-/* we use this for unified pci device name access */
-#define PCIDEV_NAME(pdev)	((pdev)->name)
-
-#else /* 2.5 or later */
-
/* recent 2.5/2.6 stores pci device names at varying places ;-) */
#ifdef CONFIG_PCI_NAMES
/* human readable name */
@@ -78,8 +58,6 @@ typedef void irqreturn_t;
#define PCIDEV_NAME(pdev)	(pci_name(pdev))
#endif

-#endif
-
/* ================================================================ */

/* non-standard PCI registers */
Index: linux-2.6.13-rc2-mm1/drivers/net/iseries_veth.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/iseries_veth.c
+++ linux-2.6.13-rc2-mm1/drivers/net/iseries_veth.c
@@ -57,7 +57,6 @@

#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/ioport.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/mac8390.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/mac8390.c
+++ linux-2.6.13-rc2-mm1/drivers/net/mac8390.c
@@ -15,7 +15,6 @@
* and fixed access to Sonic Sys card which masquerades as a Farallon
* by rayk@knightsmanor.org */

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/mv643xx_eth.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/mv643xx_eth.h
+++ linux-2.6.13-rc2-mm1/drivers/net/mv643xx_eth.h
@@ -1,7 +1,6 @@
#ifndef __MV643XX_ETH_H__
#define __MV643XX_ETH_H__

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/s2io.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/s2io.c
+++ linux-2.6.13-rc2-mm1/drivers/net/s2io.c
@@ -54,7 +54,6 @@
#include <linux/timex.h>
#include <linux/sched.h>
#include <linux/ethtool.h>
-#include <linux/version.h>
#include <linux/workqueue.h>

#include <asm/io.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/sk98lin/h/skdrv1st.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/sk98lin/h/skdrv1st.h
+++ linux-2.6.13-rc2-mm1/drivers/net/sk98lin/h/skdrv1st.h
@@ -39,9 +39,6 @@
#ifndef __INC_SKDRV1ST_H
#define __INC_SKDRV1ST_H

-/* Check kernel version */
-#include <linux/version.h>
-
typedef struct s_AC	SK_AC;

/* Set card versions */
Index: linux-2.6.13-rc2-mm1/drivers/net/sk_mca.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/sk_mca.c
+++ linux-2.6.13-rc2-mm1/drivers/net/sk_mca.c
@@ -93,7 +93,6 @@ History:
#include <linux/mca-legacy.h>
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/sk_mca.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/sk_mca.h
+++ linux-2.6.13-rc2-mm1/drivers/net/sk_mca.h
@@ -1,5 +1,3 @@
-#include <linux/version.h>
-
#ifndef _SK_MCA_INCLUDE_
#define _SK_MCA_INCLUDE_

Index: linux-2.6.13-rc2-mm1/drivers/net/starfire.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/starfire.c
+++ linux-2.6.13-rc2-mm1/drivers/net/starfire.c
@@ -143,7 +143,6 @@ TODO:	- fix forced speed/duplexing code
#define DRV_RELDATE	"January 19, 2005"

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
@@ -257,7 +256,7 @@ static int full_duplex[MAX_UNITS] = {0,
* This SUCKS.
* We need a much better method to determine if dma_addr_t is 64-bit.
*/
-#if (defined(__i386__) && defined(CONFIG_HIGHMEM) && (LINUX_VERSION_CODE > 0x20500 || defined(CONFIG_HIGHMEM64G))) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
+#if (defined(__i386__) && defined(CONFIG_HIGHMEM)) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
/* 64-bit dma_addr_t */
#define ADDR_64BITS	/* This chip uses 64 bit addresses. */
#define cpu_to_dma(x) cpu_to_le64(x)
Index: linux-2.6.13-rc2-mm1/drivers/net/tokenring/lanstreamer.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/tokenring/lanstreamer.c
+++ linux-2.6.13-rc2-mm1/drivers/net/tokenring/lanstreamer.c
@@ -120,7 +120,6 @@
#include <linux/pci.h>
#include <linux/dma-mapping.h>
#include <linux/spinlock.h>
-#include <linux/version.h>
#include <linux/bitops.h>

#include <net/checksum.h>
@@ -1932,64 +1931,6 @@ static int sprintf_info(char *buffer, st
#endif
#endif

-#if STREAMER_IOCTL && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int streamer_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        int i;
-	struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv;
-	u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-
-	switch(cmd) {
-	case IOCTL_SISR_MASK:
-		writew(SISR_MI, streamer_mmio + SISR_MASK_SUM);
-		break;
-	case IOCTL_SPIN_LOCK_TEST:
-	        printk(KERN_INFO "spin_lock() called.n");
-		spin_lock(&streamer_priv->streamer_lock);
-		spin_unlock(&streamer_priv->streamer_lock);
-		printk(KERN_INFO "spin_unlock() finished.n");
-		break;
-	case IOCTL_PRINT_BDAS:
-	        printk(KERN_INFO "bdas: RXBDA: %x RXLBDA: %x TX2FDA: %x TX2LFDA: %xn",
-		       readw(streamer_mmio + RXBDA),
-		       readw(streamer_mmio + RXLBDA),
-		       readw(streamer_mmio + TX2FDA),
-		       readw(streamer_mmio + TX2LFDA));
-		break;
-	case IOCTL_PRINT_REGISTERS:
-	        printk(KERN_INFO "registers:n");
-		printk(KERN_INFO "SISR: %04x MISR: %04x LISR: %04x BCTL: %04x BMCTL: %04xnmask  %04x mask  %04xn",
-		       readw(streamer_mmio + SISR),
-		       readw(streamer_mmio + MISR_RUM),
-		       readw(streamer_mmio + LISR),
-		       readw(streamer_mmio + BCTL),
-		       readw(streamer_mmio + BMCTL_SUM),
-		       readw(streamer_mmio + SISR_MASK),
-		       readw(streamer_mmio + MISR_MASK));
-		break;
-	case IOCTL_PRINT_RX_BUFS:
-	        printk(KERN_INFO "Print rx bufs:n");
-		for(i=0; i<STREAMER_RX_RING_SIZE; i++)
-		        printk(KERN_INFO "rx_ring %d status: 0x%xn", i,
-			       streamer_priv->streamer_rx_ring[i].status);
-		break;
-	case IOCTL_PRINT_TX_BUFS:
-	        printk(KERN_INFO "Print tx bufs:n");
-		for(i=0; i<STREAMER_TX_RING_SIZE; i++)
-		        printk(KERN_INFO "tx_ring %d status: 0x%xn", i,
-			       streamer_priv->streamer_tx_ring[i].status);
-		break;
-	case IOCTL_RX_CMD:
-	        streamer_rx(dev);
-		printk(KERN_INFO "Sent rx command.n");
-		break;
-	default:
-	        printk(KERN_INFO "Bad ioctl!n");
-	}
-	return 0;
-}
-#endif
-
static struct pci_driver streamer_pci_driver = {
.name     = "lanstreamer",
.id_table = streamer_pci_tbl,
Index: linux-2.6.13-rc2-mm1/drivers/net/tokenring/lanstreamer.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/tokenring/lanstreamer.h
+++ linux-2.6.13-rc2-mm1/drivers/net/tokenring/lanstreamer.h
@@ -60,20 +60,6 @@
*
*/

-#include <linux/version.h>
-
-#if STREAMER_IOCTL && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <asm/ioctl.h>
-#define IOCTL_PRINT_RX_BUFS   SIOCDEVPRIVATE
-#define IOCTL_PRINT_TX_BUFS   SIOCDEVPRIVATE+1
-#define IOCTL_RX_CMD          SIOCDEVPRIVATE+2
-#define IOCTL_TX_CMD          SIOCDEVPRIVATE+3
-#define IOCTL_PRINT_REGISTERS SIOCDEVPRIVATE+4
-#define IOCTL_PRINT_BDAS      SIOCDEVPRIVATE+5
-#define IOCTL_SPIN_LOCK_TEST  SIOCDEVPRIVATE+6
-#define IOCTL_SISR_MASK       SIOCDEVPRIVATE+7
-#endif
-
/* MAX_INTR - the maximum number of times we can loop
* inside the interrupt function before returning
* control to the OS (maximum value is 256)
Index: linux-2.6.13-rc2-mm1/drivers/net/typhoon.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/typhoon.c
+++ linux-2.6.13-rc2-mm1/drivers/net/typhoon.c
@@ -128,7 +128,6 @@ static const int multicast_filter_limit
#include <asm/uaccess.h>
#include <linux/in6.h>
#include <asm/checksum.h>
-#include <linux/version.h>
#include <linux/dma-mapping.h>

#include "typhoon.h"
@@ -333,12 +332,6 @@ enum state_values {
#define TYPHOON_RESET_TIMEOUT_NOSLEEP	((6 * 1000000) / TYPHOON_UDELAY)
#define TYPHOON_WAIT_TIMEOUT		((1000000 / 2) / TYPHOON_UDELAY)

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28)
-#define typhoon_synchronize_irq(x) synchronize_irq()
-#else
-#define typhoon_synchronize_irq(x) synchronize_irq(x)
-#endif
-
#if defined(NETIF_F_TSO)
#define skb_tso_size(x)		(skb_shinfo(x)->tso_size)
#define TSO_NUM_DESCRIPTORS	2
@@ -2173,7 +2166,7 @@ typhoon_close(struct net_device *dev)
printk(KERN_ERR "%s: unable to stop runtimen", dev->name);

/* Make sure there is no irq handler running on a different CPU. */
-	typhoon_synchronize_irq(dev->irq);
+	synchronize_irq(dev->irq);
free_irq(dev->irq, dev);

typhoon_free_rx_rings(tp);
Index: linux-2.6.13-rc2-mm1/drivers/net/via-velocity.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/via-velocity.c
+++ linux-2.6.13-rc2-mm1/drivers/net/via-velocity.c
@@ -61,7 +61,6 @@
#include <linux/timer.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <linux/version.h>
#include <linux/string.h>
#include <linux/wait.h>
#include <asm/io.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wan/farsync.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wan/farsync.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wan/farsync.c
@@ -17,7 +17,6 @@

#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/init.h>
@@ -1807,7 +1806,6 @@ gather_conf_info(struct fst_card_info *c
memset(info, 0, sizeof (struct fstioc_info));

i = port->index;
-	info->kernelVersion = LINUX_VERSION_CODE;
info->nports = card->nports;
info->type = card->type;
info->state = card->state;
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/orinoco.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/orinoco.h
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/orinoco.h
@@ -13,7 +13,6 @@
#include <linux/spinlock.h>
#include <linux/netdevice.h>
#include <linux/wireless.h>
-#include <linux/version.h>

#include "hermes.h"

Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/isl_38xx.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/prism54/isl_38xx.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/isl_38xx.c
@@ -18,7 +18,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/delay.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/isl_38xx.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/prism54/isl_38xx.h
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/isl_38xx.h
@@ -20,7 +20,6 @@
#ifndef _ISL_38XX_H
#define _ISL_38XX_H

-#include <linux/version.h>
#include <asm/io.h>
#include <asm/byteorder.h>

Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/isl_ioctl.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/prism54/isl_ioctl.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/isl_ioctl.c
@@ -20,7 +20,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/if_arp.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/islpci_dev.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/prism54/islpci_dev.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/islpci_dev.c
@@ -19,7 +19,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>

#include <linux/netdevice.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/islpci_dev.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/prism54/islpci_dev.h
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/islpci_dev.h
@@ -23,7 +23,6 @@
#ifndef _ISLPCI_DEV_H
#define _ISLPCI_DEV_H

-#include <linux/version.h>
#include <linux/netdevice.h>
#include <linux/wireless.h>
#include <net/iw_handler.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/islpci_eth.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/prism54/islpci_eth.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/islpci_eth.c
@@ -17,7 +17,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>

#include <linux/pci.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/islpci_hotplug.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/prism54/islpci_hotplug.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -18,7 +18,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/delay.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/ppp_mppe.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/ppp_mppe.c
+++ linux-2.6.13-rc2-mm1/drivers/net/ppp_mppe.c
@@ -44,7 +44,6 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/hostap/hostap.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap.c
@@ -17,7 +17,6 @@
#endif

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_crypt_ccmp.c
@@ -10,7 +10,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_crypt_tkip.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/hostap/hostap_crypt_tkip.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_crypt_tkip.c
@@ -10,7 +10,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_crypt_wep.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/hostap/hostap_crypt_wep.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_crypt_wep.c
@@ -10,7 +10,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_cs.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/hostap/hostap_cs.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_cs.c
@@ -1,7 +1,6 @@
#define PRISM2_PCCARD

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/if.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_hw.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/hostap/hostap_hw.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_hw.c
@@ -31,7 +31,6 @@


#include <linux/config.h>
-#include <linux/version.h>

#include <asm/delay.h>
#include <asm/uaccess.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_pci.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/hostap/hostap_pci.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_pci.c
@@ -5,7 +5,6 @@
* Andy Warner <andyw@pobox.com> */

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/if.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_plx.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/hostap/hostap_plx.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/hostap/hostap_plx.c
@@ -8,7 +8,6 @@


#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/if.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/ipw2100.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/ipw2100.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/ipw2100.c
@@ -159,7 +159,6 @@ that only one external action is invoked
#include <linux/stringify.h>
#include <linux/tcp.h>
#include <linux/types.h>
-#include <linux/version.h>
#include <linux/time.h>
#include <linux/firmware.h>
#include <linux/acpi.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/ipw2100.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/ipw2100.h
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/ipw2100.h
@@ -37,7 +37,6 @@
#include <linux/socket.h>
#include <linux/if_arp.h>
#include <linux/wireless.h>
-#include <linux/version.h>
#include <net/iw_handler.h>	// new driver API

#include <net/ieee80211.h>
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/ipw2200.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/ipw2200.c
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/ipw2200.c
@@ -7242,11 +7242,7 @@ static int ipw_pci_suspend(struct pci_de
/* Remove the PRESENT state of the device */
netif_device_detach(dev);

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-	pci_save_state(pdev, priv->pm_state);
-#else
pci_save_state(pdev);
-#endif
pci_disable_device(pdev);
pci_set_power_state(pdev, state);

@@ -7263,11 +7259,7 @@ static int ipw_pci_resume(struct pci_dev

pci_set_power_state(pdev, 0);
pci_enable_device(pdev);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-	pci_restore_state(pdev, priv->pm_state);
-#else
pci_restore_state(pdev);
-#endif
/*
* Suspend/Resume resets the PCI configuration space, so we have to
* re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries
Index: linux-2.6.13-rc2-mm1/drivers/net/wireless/ipw2200.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/net/wireless/ipw2200.h
+++ linux-2.6.13-rc2-mm1/drivers/net/wireless/ipw2200.h
@@ -34,7 +34,6 @@
#include <linux/config.h>
#include <linux/init.h>

-#include <linux/version.h>
#include <linux/pci.h>
#include <linux/netdevice.h>
#include <linux/ethtool.h>
@@ -62,15 +61,6 @@ typedef void irqreturn_t;
#define IRQ_RETVAL(x)
#endif

-#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) )
-#define __iomem
-#endif
-
-#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
-#define pci_dma_sync_single_for_cpu	pci_dma_sync_single
-#define pci_dma_sync_single_for_device	pci_dma_sync_single
-#endif
-
#ifndef HAVE_FREE_NETDEV
#define free_netdev(x) kfree(x)
#endif

[PATCH 27/82] remove linux/version.h from drivers/pcmcia/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/pcmcia/au1000_pb1x00.c  |    1 -
drivers/pcmcia/au1000_xxs1500.c |    1 -
2 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/pcmcia/au1000_pb1x00.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/pcmcia/au1000_pb1x00.c
+++ linux-2.6.13-rc2-mm1/drivers/pcmcia/au1000_pb1x00.c
@@ -30,7 +30,6 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
-#include <linux/version.h>
#include <linux/types.h>

#include <pcmcia/cs_types.h>
Index: linux-2.6.13-rc2-mm1/drivers/pcmcia/au1000_xxs1500.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/pcmcia/au1000_xxs1500.c
+++ linux-2.6.13-rc2-mm1/drivers/pcmcia/au1000_xxs1500.c
@@ -35,7 +35,6 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
-#include <linux/version.h>
#include <linux/types.h>

#include <pcmcia/cs_types.h>

[PATCH 28/82] remove linux/version.h from drivers/s390/net/claw.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/s390/net/claw.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/s390/net/claw.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/s390/net/claw.c
+++ linux-2.6.13-rc2-mm1/drivers/s390/net/claw.c
@@ -88,7 +88,6 @@
#include <linux/tcp.h>
#include <linux/timer.h>
#include <linux/types.h>
-#include <linux/version.h>

#include "cu3088.h"
#include "claw.h"

[PATCH 29/82] remove linux/version.h from drivers/scsi/3w-xxxx.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/3w-xxxx.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/3w-xxxx.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/3w-xxxx.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/3w-xxxx.h
@@ -54,7 +54,6 @@
#ifndef _3W_XXXX_H
#define _3W_XXXX_H

-#include <linux/version.h>
#include <linux/types.h>

/* AEN strings */

[PATCH 30/82] remove linux/version.h from drivers/scsi/a2091.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/a2091.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/a2091.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/a2091.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/a2091.c
@@ -2,7 +2,6 @@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/interrupt.h>

[PATCH 31/82] remove linux/version.h from drivers/scsi/aic7xxx/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

remove code for obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/aic7xxx/aic79xx_osm.c     |  262 ---------------------------------
drivers/scsi/aic7xxx/aic79xx_osm.h     |   20 --
drivers/scsi/aic7xxx/aic79xx_osm_pci.c |    6
drivers/scsi/aic7xxx/aic79xx_proc.c    |   12 -
drivers/scsi/aic7xxx/aic7xxx_osm.h     |    1
drivers/scsi/aic7xxx/aiclib.c          |    1
drivers/scsi/aic7xxx/aiclib.h          |   10 -
7 files changed, 312 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic79xx_osm.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -54,10 +54,6 @@

#include <linux/init.h>		/* __setup */

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "sd.h"			/* For geometry detection */
-#endif
-
#include <linux/mm.h>		/* For fetching system memory size */
#include <linux/delay.h>	/* For ssleep/msleep */

@@ -66,11 +62,6 @@
*/
spinlock_t ahd_list_spinlock;

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/* For dynamic sglist size calculation. */
-u_int ahd_linux_nseg;
-#endif
-
/*
* Bucket size for counting good commands in between bad ones.
*/
@@ -709,7 +700,6 @@ ahd_linux_unmap_scb(struct ahd_softc *ah
static int	   ahd_linux_detect(Scsi_Host_Template *);
static const char *ahd_linux_info(struct Scsi_Host *);
static int	   ahd_linux_queue(Scsi_Cmnd *, void (*)(Scsi_Cmnd *));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static int	   ahd_linux_slave_alloc(Scsi_Device *);
static int	   ahd_linux_slave_configure(Scsi_Device *);
static void	   ahd_linux_slave_destroy(Scsi_Device *);
@@ -717,14 +707,6 @@ static void	   ahd_linux_slave_destroy(S
static int	   ahd_linux_biosparam(struct scsi_device*,
struct block_device*, sector_t, int[]);
#endif
-#else
-static int	   ahd_linux_release(struct Scsi_Host *);
-static void	   ahd_linux_select_queue_depth(struct Scsi_Host *host,
-						Scsi_Device *scsi_devs);
-#if defined(__i386__)
-static int	   ahd_linux_biosparam(Disk *, kdev_t, int[]);
-#endif
-#endif
static int	   ahd_linux_bus_reset(Scsi_Cmnd *);
static int	   ahd_linux_dev_reset(Scsi_Cmnd *);
static int	   ahd_linux_abort(Scsi_Cmnd *);
@@ -749,45 +731,6 @@ static int	   ahd_linux_abort(Scsi_Cmnd
static void
ahd_linux_size_nseg(void)
{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	u_int cur_size;
-	u_int best_size;
-
-	/*
-	 * The SCSI allocator rounds to the nearest 512 bytes
-	 * an cannot allocate across a page boundary.  Our algorithm
-	 * is to start at 1K of scsi malloc space per-command and
-	 * loop through all factors of the PAGE_SIZE and pick the best.
-	 */
-	best_size = 0;
-	for (cur_size = 1024; cur_size <= PAGE_SIZE; cur_size *= 2) {
-		u_int nseg;
-
-		nseg = cur_size / sizeof(struct scatterlist);
-		if (nseg < AHD_LINUX_MIN_NSEG)
-			continue;
-
-		if (best_size == 0) {
-			best_size = cur_size;
-			ahd_linux_nseg = nseg;
-		} else {
-			u_int best_rem;
-			u_int cur_rem;
-
-			/*
-			 * Compare the traits of the current "best_size"
-			 * with the current size to determine if the
-			 * current size is a better size.
-			 */
-			best_rem = best_size % sizeof(struct scatterlist);
-			cur_rem = cur_size % sizeof(struct scatterlist);
-			if (cur_rem < best_rem) {
-				best_size = cur_size;
-				ahd_linux_nseg = nseg;
-			}
-		}
-	}
-#endif
}

/*
@@ -800,14 +743,6 @@ ahd_linux_detect(Scsi_Host_Template *tem
int     found;
int	error = 0;

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	/*
-	 * It is a bug that the upper layer takes
-	 * this lock just prior to calling us.
-	 */
-	spin_unlock_irq(&io_request_lock);
-#endif
-
/*
* Sanity checking of Linux SCSI data structures so
* that some of our hacks^H^H^H^H^Hassumptions aren't
@@ -855,47 +790,10 @@ ahd_linux_detect(Scsi_Host_Template *tem
if (ahd_linux_register_host(ahd, template) == 0)
found++;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	spin_lock_irq(&io_request_lock);
-#endif
aic79xx_detect_complete++;
return 0;
}

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/*
- * Free the passed in Scsi_Host memory structures prior to unloading the
- * module.
- */
-static int
-ahd_linux_release(struct Scsi_Host * host)
-{
-	struct ahd_softc *ahd;
-	u_long l;
-
-	ahd_list_lock(&l);
-	if (host != NULL) {
-
-		/*
-		 * We should be able to just perform
-		 * the free directly, but check our
-		 * list for extra sanity.
-		 */
-		ahd = ahd_find_softc(*(struct ahd_softc **)host->hostdata);
-		if (ahd != NULL) {
-			u_long s;
-
-			ahd_lock(ahd, &s);
-			ahd_intr_enable(ahd, FALSE);
-			ahd_unlock(ahd, &s);
-			ahd_free(ahd);
-		}
-	}
-	ahd_list_unlock(&l);
-	return (0);
-}
-#endif
-
/*
* Return a string describing the driver.
*/
@@ -983,7 +881,6 @@ ahd_linux_queue(Scsi_Cmnd * cmd, void (*
return (0);
}

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static int
ahd_linux_slave_alloc(Scsi_Device *device)
{
@@ -1056,92 +953,16 @@ ahd_linux_slave_destroy(Scsi_Device *dev
}
ahd_midlayer_entrypoint_unlock(ahd, &flags);
}
-#else
-/*
- * Sets the queue depth for each SCSI device hanging
- * off the input host adapter.
- */
-static void
-ahd_linux_select_queue_depth(struct Scsi_Host * host,
-			     Scsi_Device * scsi_devs)
-{
-	Scsi_Device *device;
-	Scsi_Device *ldev;
-	struct	ahd_softc *ahd;
-	u_long	flags;
-
-	ahd = *((struct ahd_softc **)host->hostdata);
-	ahd_lock(ahd, &flags);
-	for (device = scsi_devs; device != NULL; device = device->next) {
-
-		/*
-		 * Watch out for duplicate devices.  This works around
-		 * some quirks in how the SCSI scanning code does its
-		 * device management.
-		 */
-		for (ldev = scsi_devs; ldev != device; ldev = ldev->next) {
-			if (ldev->host == device->host
-			 && ldev->channel == device->channel
-			 && ldev->id == device->id
-			 && ldev->lun == device->lun)
-				break;
-		}
-		/* Skip duplicate. */
-		if (ldev != device)
-			continue;
-
-		if (device->host == host) {
-			struct	 ahd_linux_device *dev;
-
-			/*
-			 * Since Linux has attached to the device, configure
-			 * it so we don't free and allocate the device
-			 * structure on every command.
-			 */
-			dev = ahd_linux_get_device(ahd, device->channel,
-						   device->id, device->lun,
-						   /*alloc*/TRUE);
-			if (dev != NULL) {
-				dev->flags &= ~AHD_DEV_UNCONFIGURED;
-				dev->scsi_device = device;
-				ahd_linux_device_queue_depth(ahd, dev);
-				device->queue_depth = dev->openings
-						    + dev->active;
-				if ((dev->flags & (AHD_DEV_Q_BASIC
-						| AHD_DEV_Q_TAGGED)) == 0) {
-					/*
-					 * We allow the OS to queue 2 untagged
-					 * transactions to us at any time even
-					 * though we can only execute them
-					 * serially on the controller/device.
-					 * This should remove some latency.
-					 */
-					device->queue_depth = 2;
-				}
-			}
-		}
-	}
-	ahd_unlock(ahd, &flags);
-}
-#endif

#if defined(__i386__)
/*
* Return the disk geometry for the given SCSI device.
*/
static int
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
ahd_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
sector_t capacity, int geom[])
{
uint8_t *bh;
-#else
-ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
-{
-	struct	scsi_device *sdev = disk->device;
-	u_long	capacity = disk->capacity;
-	struct	buffer_head *bh;
-#endif
int	 heads;
int	 sectors;
int	 cylinders;
@@ -1151,22 +972,12 @@ ahd_linux_biosparam(Disk *disk, kdev_t d

ahd = *((struct ahd_softc **)sdev->host->hostdata);

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
bh = scsi_bios_ptable(bdev);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,17)
-	bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, block_size(dev));
-#else
-	bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, 1024);
-#endif

if (bh) {
ret = scsi_partsize(bh, capacity,
&geom[2], &geom[0], &geom[1]);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
kfree(bh);
-#else
-		brelse(bh);
-#endif
if (ret != -1)
return (ret);
}
@@ -1997,11 +1808,7 @@ ahd_linux_register_host(struct ahd_softc

*((struct ahd_softc **)host->hostdata) = ahd;
ahd_lock(ahd, &s);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
scsi_assign_lock(host, &ahd->platform_data->spin_lock);
-#elif AHD_SCSI_HAS_HOST_LOCK != 0
-	host->lock = &ahd->platform_data->spin_lock;
-#endif
ahd->platform_data->host = host;
host->can_queue = AHD_MAX_QUEUE;
host->cmd_per_lun = 2;
@@ -2020,9 +1827,6 @@ ahd_linux_register_host(struct ahd_softc
ahd_set_name(ahd, new_name);
}
host->unique_id = ahd->unit;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	scsi_set_pci_device(host, ahd->dev_softc);
-#endif
ahd_linux_setup_user_rd_strm_settings(ahd);
ahd_linux_initialize_scsi_bus(ahd);
ahd_unlock(ahd, &s);
@@ -2064,10 +1868,8 @@ ahd_linux_register_host(struct ahd_softc
ahd_linux_start_dv(ahd);
ahd_unlock(ahd, &s);

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
scsi_add_host(host, &ahd->dev_softc->dev); /* XXX handle failure */
scsi_scan_host(host);
-#endif
return (0);
}

@@ -2192,9 +1994,7 @@ ahd_platform_free(struct ahd_softc *ahd)
ahd_linux_kill_dv_thread(ahd);
ahd_teardown_runq_tasklet(ahd);
if (ahd->platform_data->host != NULL) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
scsi_remove_host(ahd->platform_data->host);
-#endif
scsi_host_put(ahd->platform_data->host);
}

@@ -2233,16 +2033,6 @@ ahd_platform_free(struct ahd_softc *ahd)
release_mem_region(ahd->platform_data->mem_busaddr,
0x1000);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-    		/*
-		 * In 2.4 we detach from the scsi midlayer before the PCI
-		 * layer invokes our remove callback.  No per-instance
-		 * detach is provided, so we must reach inside the PCI
-		 * subsystem's internals and detach our driver manually.
-		 */
-		if (ahd->dev_softc != NULL)
-			ahd->dev_softc->driver = NULL;
-#endif
free(ahd->platform_data, M_DEVBUF);
}
}
@@ -2339,7 +2129,6 @@ ahd_platform_set_tags(struct ahd_softc *
dev->maxtags = 0;
dev->openings =  1 - dev->active;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
if (dev->scsi_device != NULL) {
switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
case AHD_DEV_Q_BASIC:
@@ -2365,7 +2154,6 @@ ahd_platform_set_tags(struct ahd_softc *
break;
}
}
-#endif
}

int
@@ -2478,18 +2266,8 @@ ahd_linux_dv_thread(void *data)
* Complete thread creation.
*/
lock_kernel();
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,60)
-	/*
-	 * Don't care about any signals.
-	 */
-	siginitsetinv(&current->blocked, 0);
-
-	daemonize();
-	sprintf(current->comm, "ahd_dv_%d", ahd->unit);
-#else
daemonize("ahd_dv_%d", ahd->unit);
current->flags |= PF_NOFREEZE;
-#endif
unlock_kernel();

while (1) {
@@ -3985,7 +3763,6 @@ ahd_linux_run_device_queue(struct ahd_so
}

if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
int	msg_bytes;
uint8_t tag_msgs[2];

@@ -3995,7 +3772,6 @@ ahd_linux_run_device_queue(struct ahd_so
if (tag_msgs[0] == MSG_ORDERED_TASK)
dev->commands_since_idle_or_otag = 0;
} else
-#endif
if (dev->commands_since_idle_or_otag == AHD_OTAG_THRESH
&& (dev->flags & AHD_DEV_Q_TAGGED) != 0) {
hscb->control |= MSG_ORDERED_TASK;
@@ -4264,28 +4040,9 @@ ahd_send_async(struct ahd_softc *ahd, ch
}
case AC_SENT_BDR:
{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
WARN_ON(lun != CAM_LUN_WILDCARD);
scsi_report_device_reset(ahd->platform_data->host,
channel - 'A', target);
-#else
-		Scsi_Device *scsi_dev;
-
-		/*
-		 * Find the SCSI device associated with this
-		 * request and indicate that a UA is expected.
-		 */
-		for (scsi_dev = ahd->platform_data->host->host_queue;
-		     scsi_dev != NULL; scsi_dev = scsi_dev->next) {
-			if (channel - 'A' == scsi_dev->channel
-			 && target == scsi_dev->id
-			 && (lun == CAM_LUN_WILDCARD
-			  || lun == scsi_dev->lun)) {
-				scsi_dev->was_reset = 1;
-				scsi_dev->expecting_cc_ua = 1;
-			}
-		}
-#endif
break;
}
case AC_BUS_RESET:
@@ -4972,18 +4729,7 @@ ahd_platform_dump_card_state(struct ahd_
static int __init
ahd_linux_init(void)
{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
return ahd_linux_detect(&aic79xx_driver_template);
-#else
-	scsi_register_module(MODULE_SCSI_HA, &aic79xx_driver_template);
-	if (aic79xx_driver_template.present == 0) {
-		scsi_unregister_module(MODULE_SCSI_HA,
-				       &aic79xx_driver_template);
-		return (-ENODEV);
-	}
-
-	return (0);
-#endif
}

static void __exit
@@ -5002,14 +4748,6 @@ ahd_linux_exit(void)
ahd_linux_kill_dv_thread(ahd);
}

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	/*
-	 * In 2.4 we have to unregister from the PCI core _after_
-	 * unregistering from the scsi midlayer to avoid dangling
-	 * references.
-	 */
-	scsi_unregister_module(MODULE_SCSI_HA, &aic79xx_driver_template);
-#endif
ahd_linux_pci_exit();
}

Index: linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic79xx_osm.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -48,7 +48,6 @@
#include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/smp_lock.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <asm/byteorder.h>
#include <asm/io.h>
@@ -252,11 +251,7 @@ ahd_scb_timer_reset(struct scb *scb, u_i
/***************************** SMP support ************************************/
#include <linux/spinlock.h>

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) || defined(SCSI_HAS_HOST_LOCK))
#define AHD_SCSI_HAS_HOST_LOCK 1
-#else
-#define AHD_SCSI_HAS_HOST_LOCK 0
-#endif

#define AIC79XX_DRIVER_VERSION "1.3.11"

@@ -453,18 +448,7 @@ struct ahd_linux_target {
* manner and are allocated below 4GB, the number of S/G segments is
* unrestricted.
*/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/*
- * We dynamically adjust the number of segments in pre-2.5 kernels to
- * avoid fragmentation issues in the SCSI mid-layer's private memory
- * allocator.  See aic79xx_osm.c ahd_linux_size_nseg() for details.
- */
-extern u_int ahd_linux_nseg;
-#define	AHD_NSEG ahd_linux_nseg
-#define	AHD_LINUX_MIN_NSEG 64
-#else
#define	AHD_NSEG 128
-#endif

/*
* Per-SCB OSM storage.
@@ -925,12 +909,8 @@ ahd_flush_device_writes(struct ahd_softc
}

/**************************** Proc FS Support *********************************/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-int	ahd_linux_proc_info(char *, char **, off_t, int, int, int);
-#else
int	ahd_linux_proc_info(struct Scsi_Host *, char *, char **,
off_t, int, int);
-#endif

/*************************** Domain Validation ********************************/
#define AHD_DV_CMD(cmd) ((cmd)->scsi_done == ahd_linux_dv_complete)
Index: linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -195,13 +195,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *
}
pci_set_drvdata(pdev, ahd);
if (aic79xx_detect_complete) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
ahd_linux_register_host(ahd, &aic79xx_driver_template);
-#else
-		printf("aic79xx: ignoring PCI device found after "
-		       "initializationn");
-		return (-ENODEV);
-#endif
}
return (0);
}
Index: linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic79xx_proc.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/aic7xxx/aic79xx_proc.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic79xx_proc.c
@@ -278,13 +278,8 @@ done:
* Return information to handle /proc support for the driver.
*/
int
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-ahd_linux_proc_info(char *buffer, char **start, off_t offset,
-		    int length, int hostno, int inout)
-#else
ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
off_t offset, int length, int inout)
-#endif
{
struct	ahd_softc *ahd;
struct	info_str info;
@@ -296,14 +291,7 @@ ahd_linux_proc_info(struct Scsi_Host *sh

retval = -EINVAL;
ahd_list_lock(&l);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-		if (ahd->platform_data->host->host_no == hostno)
-			break;
-	}
-#else
ahd = ahd_find_softc(*(struct ahd_softc **)shost->hostdata);
-#endif

if (ahd == NULL)
goto done;
Index: linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic7xxx_osm.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -66,7 +66,6 @@
#include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/smp_lock.h>
-#include <linux/version.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aiclib.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/aic7xxx/aiclib.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aiclib.c
@@ -32,7 +32,6 @@

#include <linux/blkdev.h>
#include <linux/delay.h>
-#include <linux/version.h>

/* Core SCSI definitions */
#include <scsi/scsi_host.h>
Index: linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aiclib.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/aic7xxx/aiclib.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/aic7xxx/aiclib.h
@@ -866,15 +866,6 @@ typedef enum {
extern const char *scsi_sense_key_text[];

/************************* Large Disk Handling ********************************/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static __inline int aic_sector_div(u_long capacity, int heads, int sectors);
-
-static __inline int
-aic_sector_div(u_long capacity, int heads, int sectors)
-{
-	return (capacity / (heads * sectors));
-}
-#else
static __inline int aic_sector_div(sector_t capacity, int heads, int sectors);

static __inline int
@@ -884,7 +875,6 @@ aic_sector_div(sector_t capacity, int he
sector_div(capacity, (heads * sectors));
return (int)capacity;
}
-#endif

/**************************** Module Library Hack *****************************/
/*

[PATCH 32/82] remove linux/version.h from drivers/scsi/amiga7xx.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/amiga7xx.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/amiga7xx.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/amiga7xx.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/amiga7xx.c
@@ -11,7 +11,6 @@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
-#include <linux/version.h>
#include <linux/config.h>
#include <linux/zorro.h>
#include <linux/stat.h>

[PATCH 33/82] remove linux/version.h from drivers/scsi/arcmsr

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/arcmsr/arcmsr.c |    1 -
drivers/scsi/arcmsr/arcmsr.h |    1 -
2 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/arcmsr/arcmsr.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/arcmsr/arcmsr.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/arcmsr/arcmsr.c
@@ -81,7 +81,6 @@
#include <config/modversions.h>
#endif
#include <linux/module.h>
-#include <linux/version.h>
/* Now your module include files & source code follows */
#include <asm/dma.h>
#include <asm/io.h>
Index: linux-2.6.13-rc2-mm1/drivers/scsi/arcmsr/arcmsr.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/arcmsr/arcmsr.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/arcmsr/arcmsr.h
@@ -43,7 +43,6 @@
**************************************************************************
*/
#include <linux/config.h>
-#include <linux/version.h>

#if defined(__SMP__) && !defined(CONFIG_SMP)
# define CONFIG_SMP

[PATCH 34/82] remove linux/version.h from drivers/scsi/bvme6000.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/bvme6000.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/bvme6000.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/bvme6000.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/bvme6000.c
@@ -7,7 +7,6 @@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
-#include <linux/version.h>
#include <linux/zorro.h>

#include <asm/setup.h>

[PATCH 35/82] remove linux/version.h from drivers/scsi/cpqfcTSinit.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/cpqfcTSinit.c |   32 --------------------------------
1 files changed, 32 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/cpqfcTSinit.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/cpqfcTSinit.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/cpqfcTSinit.c
@@ -34,7 +34,6 @@
#include <linux/config.h>
#include <linux/interrupt.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/blkdev.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@ -66,37 +65,10 @@ MODULE_LICENSE("GPL");

int cpqfcTS_TargetDeviceReset( Scsi_Device *ScsiDev, unsigned int reset_flags);

-// This struct was originally defined in
-// /usr/src/linux/include/linux/proc_fs.h
-// since it's only partially implemented, we only use first
-// few fields...
-// NOTE: proc_fs changes in 2.4 kernel
-
-#if LINUX_VERSION_CODE < LinuxVersionCode(2,3,27)
-static struct proc_dir_entry proc_scsi_cpqfcTS =
-{
-  PROC_SCSI_CPQFCTS,           // ushort low_ino (enumerated list)
-  7,                           // ushort namelen
-  DEV_NAME,                    // const char* name
-  S_IFDIR | S_IRUGO | S_IXUGO, // mode_t mode
-  2                            // nlink_t nlink
-	                       // etc. ...
-};
-
-
-#endif
-
-#if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,7)
#  define CPQFC_DECLARE_COMPLETION(x) DECLARE_COMPLETION(x)
#  define CPQFC_WAITING waiting
#  define CPQFC_COMPLETE(x) complete(x)
#  define CPQFC_WAIT_FOR_COMPLETION(x) wait_for_completion(x);
-#else
-#  define CPQFC_DECLARE_COMPLETION(x) DECLARE_MUTEX_LOCKED(x)
-#  define CPQFC_WAITING sem
-#  define CPQFC_COMPLETE(x) up(x)
-#  define CPQFC_WAIT_FOR_COMPLETION(x) down(x)
-#endif

static int cpqfc_alloc_private_data_pool(CPQFCHBA *hba);

@@ -288,11 +260,7 @@ int cpqfcTS_detect(Scsi_Host_Template *S

ENTER("cpqfcTS_detect");

-#if LINUX_VERSION_CODE < LinuxVersionCode(2,3,27)
-  ScsiHostTemplate->proc_dir = &proc_scsi_cpqfcTS;
-#else
ScsiHostTemplate->proc_name = "cpqfcTS";
-#endif

for( i=0; i < HBA_TYPES; i++)
{

[PATCH 36/82] remove linux/version.h from drivers/scsi/dpt/dpti_i2o.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/dpt/dpti_i2o.h |   11 -----------
1 files changed, 11 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/dpt/dpti_i2o.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/dpt/dpti_i2o.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/dpt/dpti_i2o.h
@@ -22,7 +22,6 @@
#include <linux/i2o-dev.h>

#include <asm/semaphore.h> /* Needed for MUTEX init macros */
-#include <linux/version.h>
#include <linux/config.h>
#include <linux/notifier.h>
#include <asm/atomic.h>
@@ -48,21 +47,11 @@
*	I2O Interface Objects
*/

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-
-#define DECLARE_MUTEX(name) struct semaphore name=MUTEX
-
-typedef struct wait_queue *adpt_wait_queue_head_t;
-#define ADPT_DECLARE_WAIT_QUEUE_HEAD(wait) adpt_wait_queue_head_t wait = NULL
-typedef struct wait_queue adpt_wait_queue_t;
-#else
-
#include <linux/wait.h>
typedef wait_queue_head_t adpt_wait_queue_head_t;
#define ADPT_DECLARE_WAIT_QUEUE_HEAD(wait) DECLARE_WAIT_QUEUE_HEAD(wait)
typedef wait_queue_t adpt_wait_queue_t;

-#endif
/*
* message structures
*/

[PATCH 37/82] remove linux/version.h from drivers/scsi/gdth

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/gdth.c      |  204 -----------------------------------------------
drivers/scsi/gdth.h      |   11 --
drivers/scsi/gdth_proc.c |  143 --------------------------------
drivers/scsi/gdth_proc.h |    6 -
4 files changed, 1 insertion(+), 363 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/gdth.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/gdth.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/gdth.c
@@ -374,7 +374,6 @@

#include <linux/module.h>

-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
@@ -398,12 +397,7 @@
#include <asm/io.h>
#include <asm/uaccess.h>
#include <linux/spinlock.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#include <linux/blkdev.h>
-#else
-#include <linux/blk.h>
-#include "sd.h"
-#endif

#include "scsi.h"
#include <scsi/scsi_host.h>
@@ -2135,29 +2129,17 @@ static int __init gdth_search_drives(int
printk("GDT-HA %d: Vendor: %s Name: %sn",
hanum,oemstr->text.oem_company_name,ha->binfo.type_string);
/* Save the Host Drive inquiry data */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
strlcpy(ha->oem_name,oemstr->text.scsi_host_drive_inquiry_vendor_id,
sizeof(ha->oem_name));
-#else
-        strncpy(ha->oem_name,oemstr->text.scsi_host_drive_inquiry_vendor_id,7);
-        ha->oem_name[7] = '0';
-#endif
} else {
/* Old method, based on PCI ID */
TRACE2(("gdth_search_drives(): CACHE_READ_OEM_STRING_RECORD failedn"));
printk("GDT-HA %d: Name: %sn",
hanum,ha->binfo.type_string);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
if (ha->oem_id == OEM_ID_INTEL)
strlcpy(ha->oem_name,"Intel  ", sizeof(ha->oem_name));
else
strlcpy(ha->oem_name,"ICP    ", sizeof(ha->oem_name));
-#else
-        if (ha->oem_id == OEM_ID_INTEL)
-            strcpy(ha->oem_name,"Intel  ");
-        else
-            strcpy(ha->oem_name,"ICP    ");
-#endif
}

/* scanning for host drives */
@@ -4293,10 +4275,6 @@ static int __init gdth_detect(Scsi_Host_
hdr_channel = ha->bus_cnt;
ha->virt_bus = hdr_channel;

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && -    LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-                shp->highmem_io  = 0;
-#endif
if (ha->cache_feat & ha->raw_feat & ha->screen_feat & GDT_64BIT)
shp->max_cmd_len = 16;

@@ -4417,10 +4395,6 @@ static int __init gdth_detect(Scsi_Host_
hdr_channel = ha->bus_cnt;
ha->virt_bus = hdr_channel;

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && -    LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-                shp->highmem_io  = 0;
-#endif
if (ha->cache_feat & ha->raw_feat & ha->screen_feat & GDT_64BIT)
shp->max_cmd_len = 16;

@@ -4521,9 +4495,6 @@ static int __init gdth_detect(Scsi_Host_
ha->virt_bus = hdr_channel;


-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-            scsi_set_pci_device(shp, pcistr[ctr].pdev);
-#endif
if (!(ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT)||
/* 64-bit DMA only supported from FW >= x.43 */
(!ha->dma64_support)) {
@@ -4755,11 +4726,7 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *
return SUCCESS;
}

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip)
-#else
-static int gdth_bios_param(Disk *disk,kdev_t dev,int *ip)
-#endif
{
unchar b, t;
int hanum;
@@ -4767,13 +4734,8 @@ static int gdth_bios_param(Disk *disk,kd
struct scsi_device *sd;
unsigned capacity;

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
sd = sdev;
capacity = cap;
-#else
-    sd = disk->device;
-    capacity = disk->capacity;
-#endif
hanum = NUMDATA(sd->host)->hanum;
b = virt_ctr ? NUMDATA(sd->host)->busnum : sd->channel;
t = sd->id;
@@ -4921,11 +4883,7 @@ static int ioc_resetdrv(void __user *arg
gdth_cmd_str cmd;
int hanum;
gdth_ha_str *ha;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request *srp;
-#else
-    Scsi_Cmnd *scp;
-#endif

if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) ||
res.ionode >= gdth_ctr_count || res.number >= MAX_HDRIVES)
@@ -4942,7 +4900,6 @@ static int ioc_resetdrv(void __user *arg
cmd.u.cache64.DeviceNo = res.number;
else
cmd.u.cache.DeviceNo = res.number;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
srp  = scsi_allocate_request(ha->sdev, GFP_KERNEL);
if (!srp)
return -ENOMEM;
@@ -4951,16 +4908,6 @@ static int ioc_resetdrv(void __user *arg
gdth_do_req(srp, &cmd, cmnd, 30);
res.status = (ushort)srp->sr_command->SCp.Status;
scsi_release_request(srp);
-#else
-    scp  = scsi_allocate_device(ha->sdev, 1, FALSE);
-    if (!scp)
-        return -ENOMEM;
-    scp->cmd_len = 12;
-    scp->use_sg = 0;
-    gdth_do_cmd(scp, &cmd, cmnd, 30);
-    res.status = (ushort)scp->SCp.Status;
-    scsi_release_command(scp);
-#endif

if (copy_to_user(arg, &res, sizeof(gdth_ioctl_reset)))
return -EFAULT;
@@ -4974,11 +4921,7 @@ static int ioc_general(void __user *arg,
ulong64 paddr;
int hanum;
gdth_ha_str *ha;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request *srp;
-#else
-        Scsi_Cmnd *scp;
-#endif

if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general)) ||
gen.ionode >= gdth_ctr_count)
@@ -5070,7 +5013,6 @@ static int ioc_general(void __user *arg,
}
}

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
srp  = scsi_allocate_request(ha->sdev, GFP_KERNEL);
if (!srp)
return -ENOMEM;
@@ -5080,17 +5022,6 @@ static int ioc_general(void __user *arg,
gen.status = srp->sr_command->SCp.Status;
gen.info = srp->sr_command->SCp.Message;
scsi_release_request(srp);
-#else
-    scp  = scsi_allocate_device(ha->sdev, 1, FALSE);
-    if (!scp)
-        return -ENOMEM;
-    scp->cmd_len = 12;
-    scp->use_sg = 0;
-    gdth_do_cmd(scp, &gen.command, cmnd, gen.timeout);
-    gen.status = scp->SCp.Status;
-    gen.info = scp->SCp.Message;
-    scsi_release_command(scp);
-#endif

if (copy_to_user(arg + sizeof(gdth_ioctl_general), buf,
gen.data_len + gen.sense_len)) {
@@ -5113,11 +5044,7 @@ static int ioc_hdrlist(void __user *arg,
gdth_ha_str *ha;
unchar i;
int hanum, rc = -ENOMEM;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request *srp;
-#else
-    Scsi_Cmnd *scp;
-#endif

rsc = kmalloc(sizeof(*rsc), GFP_KERNEL);
cmd = kmalloc(sizeof(*cmd), GFP_KERNEL);
@@ -5133,19 +5060,11 @@ static int ioc_hdrlist(void __user *arg,
ha = HADATA(gdth_ctr_tab[hanum]);
memset(cmd, 0, sizeof(gdth_cmd_str));

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
srp  = scsi_allocate_request(ha->sdev, GFP_KERNEL);
if (!srp)
goto free_fail;
srp->sr_cmd_len = 12;
srp->sr_use_sg = 0;
-#else
-    scp  = scsi_allocate_device(ha->sdev, 1, FALSE);
-    if (!scp)
-        goto free_fail;
-    scp->cmd_len = 12;
-    scp->use_sg = 0;
-#endif

for (i = 0; i < MAX_HDRIVES; ++i) {
if (!ha->hdr[i].present) {
@@ -5163,22 +5082,12 @@ static int ioc_hdrlist(void __user *arg,
cmd->u.cache64.DeviceNo = i;
else
cmd->u.cache.DeviceNo = i;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(srp, cmd, cmnd, 30);
if (srp->sr_command->SCp.Status == S_OK)
rsc->hdr_list[i].cluster_type = srp->sr_command->SCp.Message;
-#else
-            gdth_do_cmd(scp, cmd, cmnd, 30);
-            if (scp->SCp.Status == S_OK)
-                rsc->hdr_list[i].cluster_type = scp->SCp.Message;
-#endif
}
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
scsi_release_request(srp);
-#else
-    scsi_release_command(scp);
-#endif

if (copy_to_user(arg, rsc, sizeof(gdth_ioctl_rescan)))
rc = -EFAULT;
@@ -5201,11 +5110,7 @@ static int ioc_rescan(void __user *arg,
int rc = -ENOMEM;
ulong flags;
gdth_ha_str *ha;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request *srp;
-#else
-    Scsi_Cmnd *scp;
-#endif

rsc = kmalloc(sizeof(*rsc), GFP_KERNEL);
cmd = kmalloc(sizeof(*cmd), GFP_KERNEL);
@@ -5221,19 +5126,11 @@ static int ioc_rescan(void __user *arg,
ha = HADATA(gdth_ctr_tab[hanum]);
memset(cmd, 0, sizeof(gdth_cmd_str));

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
srp  = scsi_allocate_request(ha->sdev, GFP_KERNEL);
if (!srp)
goto free_fail;
srp->sr_cmd_len = 12;
srp->sr_use_sg = 0;
-#else
-    scp  = scsi_allocate_device(ha->sdev, 1, FALSE);
-    if (!scp)
-        goto free_fail;
-    scp->cmd_len = 12;
-    scp->use_sg = 0;
-#endif

if (rsc->flag == 0) {
/* old method: re-init. cache service */
@@ -5245,19 +5142,9 @@ static int ioc_rescan(void __user *arg,
cmd->OpCode = GDT_INIT;
cmd->u.cache.DeviceNo = LINUX_OS;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(srp, cmd, cmnd, 30);
status = (ushort)srp->sr_command->SCp.Status;
info = (ulong32)srp->sr_command->SCp.Message;
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-        gdth_do_cmd(scp, cmd, cmnd, 30);
-        status = (ushort)scp->SCp.Status;
-        info = (ulong32)scp->SCp.Message;
-#else
-        gdth_do_cmd(&scp, cmd, cmnd, 30);
-        status = (ushort)scp.SCp.Status;
-        info = (ulong32)scp.SCp.Message;
-#endif
i = 0;
hdr_cnt = (status == S_OK ? (ushort)info : 0);
} else {
@@ -5272,15 +5159,9 @@ static int ioc_rescan(void __user *arg,
cmd->u.cache64.DeviceNo = i;
else
cmd->u.cache.DeviceNo = i;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(srp, cmd, cmnd, 30);
status = (ushort)srp->sr_command->SCp.Status;
info = (ulong32)srp->sr_command->SCp.Message;
-#else
-        gdth_do_cmd(scp, cmd, cmnd, 30);
-        status = (ushort)scp->SCp.Status;
-        info = (ulong32)scp->SCp.Message;
-#endif
spin_lock_irqsave(&ha->smp_lock, flags);
rsc->hdr_list[i].bus = ha->virt_bus;
rsc->hdr_list[i].target = i;
@@ -5312,15 +5193,9 @@ static int ioc_rescan(void __user *arg,
cmd->u.cache64.DeviceNo = i;
else
cmd->u.cache.DeviceNo = i;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(srp, cmd, cmnd, 30);
status = (ushort)srp->sr_command->SCp.Status;
info = (ulong32)srp->sr_command->SCp.Message;
-#else
-        gdth_do_cmd(scp, cmd, cmnd, 30);
-        status = (ushort)scp->SCp.Status;
-        info = (ulong32)scp->SCp.Message;
-#endif
spin_lock_irqsave(&ha->smp_lock, flags);
ha->hdr[i].devtype = (status == S_OK ? (ushort)info : 0);
spin_unlock_irqrestore(&ha->smp_lock, flags);
@@ -5331,15 +5206,9 @@ static int ioc_rescan(void __user *arg,
cmd->u.cache64.DeviceNo = i;
else
cmd->u.cache.DeviceNo = i;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(srp, cmd, cmnd, 30);
status = (ushort)srp->sr_command->SCp.Status;
info = (ulong32)srp->sr_command->SCp.Message;
-#else
-        gdth_do_cmd(scp, cmd, cmnd, 30);
-        status = (ushort)scp->SCp.Status;
-        info = (ulong32)scp->SCp.Message;
-#endif
spin_lock_irqsave(&ha->smp_lock, flags);
ha->hdr[i].cluster_type =
((status == S_OK && !shared_access) ? (ushort)info : 0);
@@ -5352,24 +5221,14 @@ static int ioc_rescan(void __user *arg,
cmd->u.cache64.DeviceNo = i;
else
cmd->u.cache.DeviceNo = i;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(srp, cmd, cmnd, 30);
status = (ushort)srp->sr_command->SCp.Status;
info = (ulong32)srp->sr_command->SCp.Message;
-#else
-        gdth_do_cmd(scp, cmd, cmnd, 30);
-        status = (ushort)scp->SCp.Status;
-        info = (ulong32)scp->SCp.Message;
-#endif
spin_lock_irqsave(&ha->smp_lock, flags);
ha->hdr[i].rw_attribs = (status == S_OK ? (ushort)info : 0);
spin_unlock_irqrestore(&ha->smp_lock, flags);
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
scsi_release_request(srp);
-#else
-    scsi_release_command(scp);
-#endif

if (copy_to_user(arg, rsc, sizeof(gdth_ioctl_rescan)))
rc = -EFAULT;
@@ -5416,9 +5275,7 @@ static int gdth_ioctl(struct inode *inod
{
gdth_ioctl_osvers osv;

-        osv.version = (unchar)(LINUX_VERSION_CODE >> 16);
-        osv.subversion = (unchar)(LINUX_VERSION_CODE >> 8);
-        osv.revision = (ushort)(LINUX_VERSION_CODE & 0xff);
+	memset(&osv, 0, sizeof(osv));
if (copy_to_user(argp, &osv, sizeof(gdth_ioctl_osvers)))
return -EFAULT;
break;
@@ -5515,7 +5372,6 @@ static int gdth_ioctl(struct inode *inod
ha = HADATA(gdth_ctr_tab[hanum]);

/* Because we need a Scsi_Cmnd struct., we make a scsi_allocate device also for kernels >=2.6.x */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
scp  = scsi_get_command(ha->sdev, GFP_KERNEL);
if (!scp)
return -ENOMEM;
@@ -5525,17 +5381,6 @@ static int gdth_ioctl(struct inode *inod
rval = gdth_eh_bus_reset(scp);
res.status = (rval == SUCCESS ? S_OK : S_GENERR);
scsi_put_command(scp);
-#else
-        scp  = scsi_allocate_device(ha->sdev, 1, FALSE);
-        if (!scp)
-            return -ENOMEM;
-        scp->cmd_len = 12;
-        scp->use_sg = 0;
-        scp->channel = virt_ctr ? 0 : res.number;
-        rval = gdth_eh_bus_reset(scp);
-        res.status = (rval == SUCCESS ? S_OK : S_GENERR);
-        scsi_release_command(scp);
-#endif
if (copy_to_user(argp, &res, sizeof(gdth_ioctl_reset)))
return -EFAULT;
break;
@@ -5557,11 +5402,7 @@ static void gdth_flush(int hanum)
int             i;
gdth_ha_str     *ha;
gdth_cmd_str    gdtcmd;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request    *srp;
-#else
-    Scsi_Cmnd       *scp;
-#endif
Scsi_Device     *sdev;
char            cmnd[MAX_COMMAND_SIZE];
memset(cmnd, 0xff, MAX_COMMAND_SIZE);
@@ -5569,21 +5410,12 @@ static void gdth_flush(int hanum)
TRACE2(("gdth_flush() hanum %dn",hanum));
ha = HADATA(gdth_ctr_tab[hanum]);

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);
srp  = scsi_allocate_request(sdev, GFP_KERNEL);
if (!srp)
return;
srp->sr_cmd_len = 12;
srp->sr_use_sg = 0;
-#else
-    sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);
-    scp  = scsi_allocate_device(sdev, 1, FALSE);
-    if (!scp)
-        return;
-    scp->cmd_len = 12;
-    scp->use_sg = 0;
-#endif

for (i = 0; i < MAX_HDRIVES; ++i) {
if (ha->hdr[i].present) {
@@ -5600,20 +5432,11 @@ static void gdth_flush(int hanum)
gdtcmd.u.cache.sg_canz = 0;
}
TRACE2(("gdth_flush(): flush ha %d drive %dn", hanum, i));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(srp, &gdtcmd, cmnd, 30);
-#else
-            gdth_do_cmd(scp, &gdtcmd, cmnd, 30);
-#endif
}
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
scsi_release_request(srp);
scsi_free_host_dev(sdev);
-#else
-    scsi_release_command(scp);
-    scsi_free_host_dev(sdev);
-#endif
}

/* shutdown routine */
@@ -5622,13 +5445,8 @@ static int gdth_halt(struct notifier_blo
int             hanum;
#ifndef __alpha__
gdth_cmd_str    gdtcmd;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request    *srp;
Scsi_Device     *sdev;
-#else
-    Scsi_Cmnd       *scp;
-    Scsi_Device     *sdev;
-#endif
char            cmnd[MAX_COMMAND_SIZE];
#endif

@@ -5647,7 +5465,6 @@ static int gdth_halt(struct notifier_blo
gdtcmd.Service = CACHESERVICE;
gdtcmd.OpCode = GDT_RESET;
TRACE2(("gdth_halt(): reset controller %dn", hanum));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);
srp  = scsi_allocate_request(sdev, GFP_KERNEL);
if (!srp) {
@@ -5659,19 +5476,6 @@ static int gdth_halt(struct notifier_blo
gdth_do_req(srp, &gdtcmd, cmnd, 10);
scsi_release_request(srp);
scsi_free_host_dev(sdev);
-#else
-        sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);
-        scp  = scsi_allocate_device(sdev, 1, FALSE);
-        if (!scp) {
-            unregister_reboot_notifier(&gdth_notifier);
-            return NOTIFY_OK;
-        }
-        scp->cmd_len = 12;
-        scp->use_sg = 0;
-        gdth_do_cmd(scp, &gdtcmd, cmnd, 10);
-        scsi_release_command(scp);
-        scsi_free_host_dev(sdev);
-#endif
#endif
}
printk("Done.n");
@@ -5699,12 +5503,6 @@ static Scsi_Host_Template driver_templat
.cmd_per_lun            = GDTH_MAXC_P_L,
.unchecked_isa_dma      = 1,
.use_clustering         = ENABLE_CLUSTERING,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-        .use_new_eh_code        = 1,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-        .highmem_io             = 1,
-#endif
-#endif
};

#include "scsi_module.c"
Index: linux-2.6.13-rc2-mm1/drivers/scsi/gdth.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/gdth.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/gdth.h
@@ -13,7 +13,6 @@
* $Id: gdth.h,v 1.57 2004/03/31 11:52:09 achim Exp $
*/

-#include <linux/version.h>
#include <linux/types.h>

#ifndef TRUE
@@ -936,18 +935,12 @@ typedef struct {
gdth_binfo_str      binfo;                  /* controller info */
gdth_evt_data       dvr;                    /* event structure */
spinlock_t          smp_lock;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
struct pci_dev      *pdev;
-#endif
char                oem_name[8];
#ifdef GDTH_DMA_STATISTICS
ulong               dma32_cnt, dma64_cnt;   /* statistics: DMA buffer */
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
Scsi_Device         *sdev;
-#else
-    Scsi_Device         sdev;
-#endif
} gdth_ha_str;

/* structure for scsi_register(), SCSI bus != 0 */
@@ -1029,10 +1022,6 @@ typedef struct {

/* function prototyping */

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
int gdth_proc_info(struct Scsi_Host *, char *,char **,off_t,int,int);
-#else
-int gdth_proc_info(char *,char **,off_t,int,int,int);
-#endif

#endif
Index: linux-2.6.13-rc2-mm1/drivers/scsi/gdth_proc.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/gdth_proc.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/gdth_proc.c
@@ -4,7 +4,6 @@

#include <linux/completion.h>

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
int gdth_proc_info(struct Scsi_Host *host, char *buffer,char **start,off_t offset,int length,
int inout)
{
@@ -21,61 +20,21 @@ int gdth_proc_info(struct Scsi_Host *hos
else
return(gdth_get_info(buffer,start,offset,length,host,hanum,busnum));
}
-#else
-int gdth_proc_info(char *buffer,char **start,off_t offset,int length,int hostno,
-                   int inout)
-{
-    int hanum,busnum,i;
-
-    TRACE2(("gdth_proc_info() length %d offs %d inout %dn",
-            length,(int)offset,inout));
-
-    for (i = 0; i < gdth_ctr_vcount; ++i) {
-        if (gdth_ctr_vtab[i]->host_no == hostno)
-            break;
-    }
-    if (i == gdth_ctr_vcount)
-        return(-EINVAL);
-
-    hanum = NUMDATA(gdth_ctr_vtab[i])->hanum;
-    busnum= NUMDATA(gdth_ctr_vtab[i])->busnum;
-
-    if (inout)
-        return(gdth_set_info(buffer,length,gdth_ctr_vtab[i],hanum,busnum));
-    else
-        return(gdth_get_info(buffer,start,offset,length,
-                             gdth_ctr_vtab[i],hanum,busnum));
-}
-#endif

static int gdth_set_info(char *buffer,int length,struct Scsi_Host *host,
int hanum,int busnum)
{
int             ret_val = -EINVAL;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request    *scp;
Scsi_Device     *sdev;
-#else
-    Scsi_Cmnd       *scp;
-    Scsi_Device     *sdev;
-#endif
TRACE2(("gdth_set_info() ha %d bus %dn",hanum,busnum));

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
sdev = scsi_get_host_dev(host);
scp  = scsi_allocate_request(sdev, GFP_KERNEL);
if (!scp)
return -ENOMEM;
scp->sr_cmd_len = 12;
scp->sr_use_sg = 0;
-#else
-    sdev = scsi_get_host_dev(host);
-    scp  = scsi_allocate_device(sdev, 1, FALSE);
-    if (!scp)
-        return -ENOMEM;
-    scp->cmd_len = 12;
-    scp->use_sg = 0;
-#endif

if (length >= 4) {
if (strncmp(buffer,"gdth",4) == 0) {
@@ -84,21 +43,12 @@ static int gdth_set_info(char *buffer,in
ret_val = gdth_set_asc_info( buffer, length, hanum, scp );
}
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
scsi_release_request(scp);
scsi_free_host_dev(sdev);
-#else
-    scsi_release_command(scp);
-    scsi_free_host_dev(sdev);
-#endif
return ret_val;
}

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Request *scp)
-#else
-static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Cmnd *scp)
-#endif
{
int             orig_length, drive, wb_mode;
int             i, found;
@@ -146,11 +96,7 @@ static int gdth_set_asc_info(char *buffe
gdtcmd.u.cache.DeviceNo = i;
gdtcmd.u.cache.BlockNo = 1;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(scp, &gdtcmd, cmnd, 30);
-#else
-                gdth_do_cmd(scp, &gdtcmd, cmnd, 30);
-#endif
}
}
if (!found)
@@ -202,11 +148,7 @@ static int gdth_set_asc_info(char *buffe
gdtcmd.u.ioctl.subfunc = CACHE_CONFIG;
gdtcmd.u.ioctl.channel = INVALID_CHANNEL;
pcpar->write_back = wb_mode==1 ? 0:1;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(scp, &gdtcmd, cmnd, 30);
-#else
-        gdth_do_cmd(scp, &gdtcmd, cmnd, 30);
-#endif
gdth_ioctl_free(hanum, GDTH_SCRATCH, ha->pscratch, paddr);
printk("Done.n");
return(orig_length);
@@ -230,13 +172,8 @@ static int gdth_get_info(char *buffer,ch

gdth_cmd_str *gdtcmd;
gdth_evt_str *estr;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request *scp;
Scsi_Device *sdev;
-#else
-    Scsi_Cmnd *scp;
-    Scsi_Device *sdev;
-#endif
char hrec[161];
struct timeval tv;

@@ -260,28 +197,12 @@ static int gdth_get_info(char *buffer,ch
TRACE2(("gdth_get_info() ha %d bus %dn",hanum,busnum));
ha = HADATA(gdth_ctr_tab[hanum]);

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
sdev = scsi_get_host_dev(host);
scp  = scsi_allocate_request(sdev, GFP_KERNEL);
if (!scp)
goto free_fail;
scp->sr_cmd_len = 12;
scp->sr_use_sg = 0;
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-    sdev = scsi_get_host_dev(host);
-    scp  = scsi_allocate_device(sdev, 1, FALSE);
-    if (!scp)
-        goto free_fail;
-    scp->cmd_len = 12;
-    scp->use_sg = 0;
-#else
-    memset(&sdev,0,sizeof(Scsi_Device));
-    memset(&scp, 0,sizeof(Scsi_Cmnd));
-    sdev.host = scp.host = host;
-    sdev.id = scp.target = sdev.host->this_id;
-    scp.device = &sdev;
-#endif
-

/* request is i.e. "cat /proc/scsi/gdth/0" */
/* format: %-15st%-10st%-15st%s */
@@ -386,13 +307,8 @@ static int gdth_get_info(char *buffer,ch
sizeof(pds->list[0]);
if (pds->entries > cnt)
pds->entries = cnt;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(scp, gdtcmd, cmnd, 30);
if (scp->sr_command->SCp.Status != S_OK)
-#else
-            gdth_do_cmd(scp, gdtcmd, cmnd, 30);
-            if (scp->SCp.Status != S_OK)
-#endif
{
pds->count = 0;
}
@@ -410,13 +326,8 @@ static int gdth_get_info(char *buffer,ch
gdtcmd->u.ioctl.subfunc = SCSI_DR_INFO | L_CTRL_PATTERN;
gdtcmd->u.ioctl.channel =
ha->raw[i].address | ha->raw[i].id_list[j];
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(scp, gdtcmd, cmnd, 30);
if (scp->sr_command->SCp.Status == S_OK)
-#else
-                gdth_do_cmd(scp, gdtcmd, cmnd, 30);
-                if (scp->SCp.Status == S_OK)
-#endif
{
strncpy(hrec,pdi->vendor,8);
strncpy(hrec+8,pdi->product,16);
@@ -466,13 +377,8 @@ static int gdth_get_info(char *buffer,ch
gdtcmd->u.ioctl.channel =
ha->raw[i].address | ha->raw[i].id_list[j];
pdef->sddc_type = 0x08;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(scp, gdtcmd, cmnd, 30);
if (scp->sr_command->SCp.Status == S_OK)
-#else
-                    gdth_do_cmd(scp, gdtcmd, cmnd, 30);
-                    if (scp->SCp.Status == S_OK)
-#endif
{
size = sprintf(buffer+len,
" Grown Defects:t%dn",
@@ -519,13 +425,8 @@ static int gdth_get_info(char *buffer,ch
gdtcmd->u.ioctl.param_size = sizeof(gdth_cdrinfo_str);
gdtcmd->u.ioctl.subfunc = CACHE_DRV_INFO;
gdtcmd->u.ioctl.channel = drv_no;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(scp, gdtcmd, cmnd, 30);
if (scp->sr_command->SCp.Status != S_OK)
-#else
-                gdth_do_cmd(scp, gdtcmd, cmnd, 30);
-                if (scp->SCp.Status != S_OK)
-#endif
{
break;
}
@@ -629,13 +530,8 @@ static int gdth_get_info(char *buffer,ch
gdtcmd->u.ioctl.param_size = sizeof(gdth_arrayinf_str);
gdtcmd->u.ioctl.subfunc = ARRAY_INFO | LA_CTRL_PATTERN;
gdtcmd->u.ioctl.channel = i;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(scp, gdtcmd, cmnd, 30);
if (scp->sr_command->SCp.Status == S_OK)
-#else
-            gdth_do_cmd(scp, gdtcmd, cmnd, 30);
-            if (scp->SCp.Status == S_OK)
-#endif
{
if (pai->ai_state == 0)
strcpy(hrec, "idle");
@@ -710,13 +606,8 @@ static int gdth_get_info(char *buffer,ch
gdtcmd->u.ioctl.channel = i;
phg->entries = MAX_HDRIVES;
phg->offset = GDTOFFSOF(gdth_hget_str, entry[0]);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
gdth_do_req(scp, gdtcmd, cmnd, 30);
if (scp->sr_command->SCp.Status != S_OK)
-#else
-            gdth_do_cmd(scp, gdtcmd, cmnd, 30);
-            if (scp->SCp.Status != S_OK)
-#endif
{
ha->hdr[i].ldr_no = i;
ha->hdr[i].rw_attribs = 0;
@@ -791,13 +682,8 @@ static int gdth_get_info(char *buffer,ch
}

stop_output:
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
scsi_release_request(scp);
scsi_free_host_dev(sdev);
-#else
-    scsi_release_command(scp);
-    scsi_free_host_dev(sdev);
-#endif
*start = buffer +(offset-begin);
len -= (offset-begin);
if (len > length)
@@ -813,7 +699,6 @@ free_fail:
}


-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static void gdth_do_req(Scsi_Request *scp, gdth_cmd_str *gdtcmd,
char *cmnd, int timeout)
{
@@ -832,42 +717,14 @@ static void gdth_do_req(Scsi_Request *sc
wait_for_completion(&wait);
}

-#else
-static void gdth_do_cmd(Scsi_Cmnd *scp, gdth_cmd_str *gdtcmd,
-                        char *cmnd, int timeout)
-{
-    unsigned bufflen;
-    DECLARE_COMPLETION(wait);
-
-    TRACE2(("gdth_do_cmd()n"));
-    if (gdtcmd != NULL) {
-        scp->SCp.this_residual = IOCTL_PRI;
-        bufflen = sizeof(gdth_cmd_str);
-    } else {
-        scp->SCp.this_residual = DEFAULT_PRI;
-        bufflen = 0;
-    }
-
-    scp->request.rq_status = RQ_SCSI_BUSY;
-    scp->request.waiting = &wait;
-    scsi_do_cmd(scp, cmnd, gdtcmd, bufflen, gdth_scsi_done, timeout*HZ, 1);
-    wait_for_completion(&wait);
-}
-#endif

void gdth_scsi_done(Scsi_Cmnd *scp)
{
TRACE2(("gdth_scsi_done()n"));

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
scp->request->rq_status = RQ_SCSI_DONE;
if (scp->request->waiting != NULL)
complete(scp->request->waiting);
-#else
-    scp->request.rq_status = RQ_SCSI_DONE;
-    if (scp->request.waiting != NULL)
-        complete(scp->request.waiting);
-#endif
}

static char *gdth_ioctl_alloc(int hanum, int size, int scratch,
Index: linux-2.6.13-rc2-mm1/drivers/scsi/gdth_proc.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/gdth_proc.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/gdth_proc.h
@@ -10,15 +10,9 @@ static int gdth_set_info(char *buffer,in
static int gdth_get_info(char *buffer,char **start,off_t offset,int length,
struct Scsi_Host *host,int hanum,int busnum);

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static void gdth_do_req(Scsi_Request *srp, gdth_cmd_str *cmd,
char *cmnd, int timeout);
static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Request *scp);
-#else
-static void gdth_do_cmd(Scsi_Cmnd *scp, gdth_cmd_str *cmd,
-                        char *cmnd, int timeout);
-static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Cmnd *scp);
-#endif

static char *gdth_ioctl_alloc(int hanum, int size, int scratch,
ulong64 *paddr);

[PATCH 38/82] remove linux/version.h from drivers/scsi/gvp11.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/gvp11.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/gvp11.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/gvp11.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/gvp11.c
@@ -2,7 +2,6 @@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/interrupt.h>

[PATCH 39/82] remove linux/version.h from drivers/scsi/ibmmca.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/ibmmca.c |    6 ------
1 files changed, 6 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/ibmmca.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/ibmmca.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/ibmmca.c
@@ -18,12 +18,6 @@
*/

#include <linux/config.h>
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45)
-#error "This driver works only with kernel 2.5.45 or higher!"
-#endif
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>

[PATCH 40/82] remove linux/version.h from drivers/scsi/ips

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/ips.c |  104 -----------------------------------------------------
drivers/scsi/ips.h |   33 ----------------
2 files changed, 137 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/ips.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/ips.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/ips.c
@@ -162,7 +162,6 @@
#include <asm/byteorder.h>
#include <asm/page.h>
#include <linux/stddef.h>
-#include <linux/version.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/kernel.h>
@@ -180,12 +179,7 @@
#include <scsi/sg.h>

#include "scsi.h"
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
-#include "hosts.h"
-#else
#include <scsi/scsi_host.h>
-#endif

#include "ips.h"

@@ -214,21 +208,10 @@ module_param(ips, charp, 0);
#warning "This driver has only been tested on the x86/ia64/x86_64 platforms"
#endif

-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
-#include <linux/blk.h>
-#include "sd.h"
-#define IPS_SG_ADDRESS(sg)       ((sg)->address)
-#define IPS_LOCK_SAVE(lock,flags) spin_lock_irqsave(&io_request_lock,flags)
-#define IPS_UNLOCK_RESTORE(lock,flags) spin_unlock_irqrestore(&io_request_lock,flags)
-#ifndef __devexit_p
-#define __devexit_p(x) x
-#endif
-#else
#define IPS_SG_ADDRESS(sg)      (page_address((sg)->page) ?                                     page_address((sg)->page)+(sg)->offset : NULL)
#define IPS_LOCK_SAVE(lock,flags) do{spin_lock(lock);(void)flags;}while(0)
#define IPS_UNLOCK_RESTORE(lock,flags) do{spin_unlock(lock);(void)flags;}while(0)
-#endif

#define IPS_DMA_DIR(scb) ((!scb->scsi_cmd || ips_is_passthru(scb->scsi_cmd) ||                           DMA_NONE == scb->scsi_cmd->sc_data_direction) ? @@ -384,24 +367,13 @@ static Scsi_Host_Template ips_driver_tem
.eh_abort_handler	= ips_eh_abort,
.eh_host_reset_handler	= ips_eh_reset,
.proc_name		= "ips",
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
.proc_info		= ips_proc_info,
.slave_configure	= ips_slave_configure,
-#else
-	.proc_info		= ips_proc24_info,
-	.select_queue_depths	= ips_select_queue_depth,
-#endif
.bios_param		= ips_biosparam,
.this_id		= -1,
.sg_tablesize		= IPS_MAX_SG,
.cmd_per_lun		= 3,
.use_clustering		= ENABLE_CLUSTERING,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	.use_new_eh_code	= 1,
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)  &&  LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-    .highmem_io          = 1,
-#endif
};

static IPS_DEFINE_COMPAT_TABLE( Compatable );	/* Version Compatability Table      */
@@ -1186,17 +1158,10 @@ ips_queue(Scsi_Cmnd * SC, void (*done) (
/*                                                                          */
/****************************************************************************/
static int
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-ips_biosparam(Disk * disk, kdev_t dev, int geom[])
-{
-	ips_ha_t *ha = (ips_ha_t *) disk->device->host->hostdata;
-	unsigned long capacity = disk->capacity;
-#else
ips_biosparam(struct scsi_device *sdev, struct block_device *bdev,
sector_t capacity, int geom[])
{
ips_ha_t *ha = (ips_ha_t *) sdev->host->hostdata;
-#endif
int heads;
int sectors;
int cylinders;
@@ -1234,70 +1199,6 @@ ips_biosparam(struct scsi_device *sdev,
return (0);
}

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-/* ips_proc24_info is a wrapper around ips_proc_info *
- * for compatibility with the 2.4 scsi parameters    */
-static int
-ips_proc24_info(char *buffer, char **start, off_t offset, int length,
-		              int hostno, int func)
-{
-	int i;
-
-	for (i = 0; i < ips_next_controller; i++) {
-		if (ips_sh[i] && ips_sh[i]->host_no == hostno) {
-			return ips_proc_info(ips_sh[i], buffer, start,
-					     offset, length, func);
-		}
-	}
-	return -EINVAL;
-}
-
-/****************************************************************************/
-/*                                                                          */
-/* Routine Name: ips_select_queue_depth                                     */
-/*                                                                          */
-/* Routine Description:                                                     */
-/*                                                                          */
-/*   Select queue depths for the devices on the contoller                   */
-/*                                                                          */
-/****************************************************************************/
-static void
-ips_select_queue_depth(struct Scsi_Host *host, Scsi_Device * scsi_devs)
-{
-	Scsi_Device *device;
-	ips_ha_t *ha;
-	int count = 0;
-	int min;
-
-	ha = IPS_HA(host);
-	min = ha->max_cmds / 4;
-
-	for (device = scsi_devs; device; device = device->next) {
-		if (device->host == host) {
-			if ((device->channel == 0) && (device->type == 0))
-				count++;
-		}
-	}
-
-	for (device = scsi_devs; device; device = device->next) {
-		if (device->host == host) {
-			if ((device->channel == 0) && (device->type == 0)) {
-				device->queue_depth =
-				    (ha->max_cmds - 1) / count;
-				if (device->queue_depth < min)
-					device->queue_depth = min;
-			} else {
-				device->queue_depth = 2;
-			}
-
-			if (device->queue_depth < 2)
-				device->queue_depth = 2;
-		}
-	}
-}
-
-#else
/****************************************************************************/
/*                                                                          */
/* Routine Name: ips_slave_configure                                        */
@@ -1322,7 +1223,6 @@ ips_slave_configure(Scsi_Device * SDptr)
}
return 0;
}
-#endif

/****************************************************************************/
/*                                                                          */
@@ -7044,9 +6944,7 @@ ips_register_scsi(int index)
sh->unchecked_isa_dma = sh->hostt->unchecked_isa_dma;
sh->use_clustering = sh->hostt->use_clustering;

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,7)
sh->max_sectors = 128;
-#endif

sh->max_id = ha->ntargets;
sh->max_lun = ha->nlun;
@@ -7470,9 +7368,7 @@ ips_init_phase2(int index)
return SUCCESS;
}

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
MODULE_LICENSE("GPL");
-#endif

MODULE_DESCRIPTION("IBM ServeRAID Adapter Driver " IPS_VER_STRING);

Index: linux-2.6.13-rc2-mm1/drivers/scsi/ips.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/ips.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/ips.h
@@ -56,9 +56,7 @@
/*
* Some handy macros
*/
-   #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) || defined CONFIG_HIGHIO
#define IPS_HIGHIO
-   #endif

#define IPS_HA(x)                   ((ips_ha_t *) x->hostdata)
#define IPS_COMMAND_ID(ha, scb)     (int) (scb - ha->scbs)
@@ -82,31 +80,7 @@
#define IPS_SGLIST_SIZE(ha)       (IPS_USE_ENH_SGLIST(ha) ?                                           sizeof(IPS_ENH_SG_LIST) : sizeof(IPS_STD_SG_LIST))

-   #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,4)
-      #define pci_set_dma_mask(dev,mask) ( mask > 0xffffffff ? 1:0 )
-      #define scsi_set_pci_device(sh,dev) (0)
-   #endif

-   #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-      #ifndef irqreturn_t
-         typedef void irqreturn_t;
-      #endif
-
-      #define IRQ_NONE
-      #define IRQ_HANDLED
-      #define IRQ_RETVAL(x)
-      #define IPS_REGISTER_HOSTS(SHT)      scsi_register_module(MODULE_SCSI_HA,SHT)
-      #define IPS_UNREGISTER_HOSTS(SHT)    scsi_unregister_module(MODULE_SCSI_HA,SHT)
-      #define IPS_ADD_HOST(shost,device)
-      #define IPS_REMOVE_HOST(shost)
-      #define IPS_SCSI_SET_DEVICE(sh,ha)   scsi_set_pci_device(sh, (ha)->pcidev)
-      #define IPS_PRINTK(level, pcidev, format, arg...)                 -            printk(level "%s %s:" format , "ips" ,     -            (pcidev)->slot_name , ## arg)
-      #define scsi_host_alloc(sh,size)         scsi_register(sh,size)
-      #define scsi_host_put(sh)             scsi_unregister(sh)
-   #else
#define IPS_REGISTER_HOSTS(SHT)      (!ips_detect(SHT))
#define IPS_UNREGISTER_HOSTS(SHT)
#define IPS_ADD_HOST(shost,device)   do { scsi_add_host(shost,device); scsi_scan_host(shost); } while (0)
@@ -114,7 +88,6 @@
#define IPS_SCSI_SET_DEVICE(sh,ha)   do { } while (0)
#define IPS_PRINTK(level, pcidev, format, arg...)                              dev_printk(level , &((pcidev)->dev) , format , ## arg)
-   #endif

#ifndef MDELAY
#define MDELAY mdelay
@@ -444,16 +417,10 @@
/*
* Scsi_Host Template
*/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-   static int ips_proc24_info(char *, char **, off_t, int, int, int);
-   static void ips_select_queue_depth(struct Scsi_Host *, Scsi_Device *);
-   static int ips_biosparam(Disk *disk, kdev_t dev, int geom[]);
-#else
static int ips_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
static int ips_biosparam(struct scsi_device *sdev, struct block_device *bdev,
sector_t capacity, int geom[]);
static int ips_slave_configure(Scsi_Device *SDptr);
-#endif

/*
* Raid Command Formats

[PATCH 41/82] remove linux/version.h from drivers/scsi/iteraid.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>
drivers/scsi/iteraid.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/iteraid.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/iteraid.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/iteraid.h
@@ -23,7 +23,6 @@
#ifndef _ITERAID_H_
#define _ITERAID_H_

-#include <linux/version.h>
#include <linux/types.h>

#define ITE_VENDOR_ID	0x1283

[PATCH 42/82] remove linux/version.h from drivers/scsi/megaraid

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/megaraid/mega_common.h |    1 -
drivers/scsi/megaraid/megaraid_mm.h |    1 -
2 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/megaraid/mega_common.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/megaraid/mega_common.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/megaraid/mega_common.h
@@ -25,7 +25,6 @@
#include <linux/delay.h>
#include <linux/blkdev.h>
#include <linux/list.h>
-#include <linux/version.h>
#include <linux/moduleparam.h>
#include <linux/dma-mapping.h>
#include <asm/semaphore.h>
Index: linux-2.6.13-rc2-mm1/drivers/scsi/megaraid/megaraid_mm.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/megaraid/megaraid_mm.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/megaraid/megaraid_mm.h
@@ -18,7 +18,6 @@
#include <linux/spinlock.h>
#include <linux/fs.h>
#include <asm/uaccess.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/pci.h>

[PATCH 43/82] remove linux/version.h from drivers/scsi/mvme147.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/mvme147.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/mvme147.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/mvme147.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/mvme147.c
@@ -2,7 +2,6 @@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
-#include <linux/version.h>
#include <linux/interrupt.h>

#include <asm/page.h>

[PATCH 44/82] remove linux/version.h from drivers/scsi/mvme16x.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/mvme16x.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/mvme16x.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/mvme16x.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/mvme16x.c
@@ -7,7 +7,6 @@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
-#include <linux/version.h>

#include <asm/page.h>
#include <asm/pgtable.h>

[PATCH 45/82] remove linux/version.h from drivers/scsi/nsp32

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/nsp32.c |   73 ---------------------------------------------------
drivers/scsi/nsp32.h |   42 -----------------------------
2 files changed, 115 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/nsp32.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/nsp32.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/nsp32.c
@@ -23,7 +23,6 @@
*   1.2: PowerPC (big endian) support.
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@ -49,10 +48,6 @@
#include <scsi/scsi_host.h>
#include <scsi/scsi_ioctl.h>

-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-# include <linux/blk.h>
-#endif
-
#include "nsp32.h"


@@ -199,17 +194,9 @@ static int  __init    init_nsp32  (void)
static void __exit    exit_nsp32  (void);

/* struct Scsi_Host_Template */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
static int         nsp32_proc_info   (struct Scsi_Host *, char *, char **, off_t, int, int);
-#else
-static int         nsp32_proc_info   (char *, char **, off_t, int, int, int);
-#endif

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
static int         nsp32_detect      (struct pci_dev *pdev);
-#else
-static int         nsp32_detect      (Scsi_Host_Template *);
-#endif
static int         nsp32_queuecommand(struct scsi_cmnd *,
void (*done)(struct scsi_cmnd *));
static const char *nsp32_info        (struct Scsi_Host *);
@@ -296,15 +283,6 @@ static struct scsi_host_template nsp32_t
.eh_abort_handler       	= nsp32_eh_abort,
.eh_bus_reset_handler		= nsp32_eh_bus_reset,
.eh_host_reset_handler		= nsp32_eh_host_reset,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74))
-	.detect				= nsp32_detect,
-	.release			= nsp32_release,
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2))
-	.use_new_eh_code        	= 1,
-#else
-/*	.highmem_io			= 1, */
-#endif
};

#include "nsp32_io.h"
@@ -1211,12 +1189,8 @@ static irqreturn_t do_nsp32_isr(int irq,
int ret;
int handled = 0;

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
struct Scsi_Host *host = data->Host;
spin_lock_irqsave(host->host_lock, flags);
-#else
-	spin_lock_irqsave(&io_request_lock, flags);
-#endif

/*
* IRQ check, then enable IRQ mask
@@ -1480,11 +1454,7 @@ static irqreturn_t do_nsp32_isr(int irq,
nsp32_write2(base, IRQ_CONTROL, 0);

out2:
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
spin_unlock_irqrestore(host->host_lock, flags);
-#else
-	spin_unlock_irqrestore(&io_request_lock, flags);
-#endif

nsp32_dbg(NSP32_DEBUG_INTR, "exit");

@@ -1500,27 +1470,18 @@ static irqreturn_t do_nsp32_isr(int irq,
}  	} while(0)
static int nsp32_proc_info(
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
struct Scsi_Host *host,
-#endif
char             *buffer,
char            **start,
off_t             offset,
int               length,
-#if !(LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
-	int               hostno,
-#endif
int               inout)
{
char             *pos = buffer;
int               thislength;
unsigned long     flags;
nsp32_hw_data    *data;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
int               hostno;
-#else
-	struct Scsi_Host *host;
-#endif
unsigned int      base;
unsigned char     mode_reg;
int               id, speed;
@@ -1531,15 +1492,7 @@ static int nsp32_proc_info(
return -EINVAL;
}

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
hostno = host->host_no;
-#else
-	/* search this HBA host */
-	host = scsi_host_hn_get(hostno);
-	if (host == NULL) {
-		return -ESRCH;
-	}
-#endif
data = (nsp32_hw_data *)host->hostdata;
base = host->io_port;

@@ -2674,17 +2627,10 @@ static void nsp32_sack_negate(nsp32_hw_d
*	0x900-0xbff: (map same 0x800-0x8ff I/O port image repeatedly)
*	0xc00-0xfff: CardBus status registers
*/
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
#define DETECT_OK 0
#define DETECT_NG 1
#define PCIDEV    pdev
static int nsp32_detect(struct pci_dev *pdev)
-#else
-#define DETECT_OK 1
-#define DETECT_NG 0
-#define PCIDEV    (data->Pci)
-static int nsp32_detect(Scsi_Host_Template *sht)
-#endif
{
struct Scsi_Host *host;	/* registered host structure */
struct resource  *res;
@@ -2697,11 +2643,7 @@ static int nsp32_detect(Scsi_Host_Templa
/*
* register this HBA as SCSI device
*/
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
host = scsi_host_alloc(&nsp32_template, sizeof(nsp32_hw_data));
-#else
-	host = scsi_register(sht, sizeof(nsp32_hw_data));
-#endif
if (host == NULL) {
nsp32_msg (KERN_ERR, "failed to scsi register");
goto err;
@@ -2719,9 +2661,6 @@ static int nsp32_detect(Scsi_Host_Templa
host->unique_id = data->BaseAddress;
host->n_io_port	= data->NumAddress;
host->base      = (unsigned long)data->MmioAddress;
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,63))
-	scsi_set_pci_device(host, PCIDEV);
-#endif

data->Host      = host;
spin_lock_init(&(data->Lock));
@@ -2884,10 +2823,8 @@ static int nsp32_detect(Scsi_Host_Templa
goto free_irq;
}

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
scsi_add_host (host, &PCIDEV->dev);
scsi_scan_host(host);
-#endif
pci_set_drvdata(PCIDEV, host);
return DETECT_OK;

@@ -3519,11 +3456,7 @@ static int __devinit nsp32_probe(struct

pci_set_master(pdev);

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
ret = nsp32_detect(pdev);
-#else
-	ret = scsi_register_host(&nsp32_template);
-#endif

nsp32_msg(KERN_INFO, "irq: %i mmio: %p+0x%lx slot: %s model: %s",
pdev->irq,
@@ -3538,21 +3471,15 @@ static int __devinit nsp32_probe(struct

static void __devexit nsp32_remove(struct pci_dev *pdev)
{
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
struct Scsi_Host *host = pci_get_drvdata(pdev);
-#endif

nsp32_dbg(NSP32_DEBUG_REGISTER, "enter");

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
scsi_remove_host(host);

nsp32_release(host);

scsi_host_put(host);
-#else
-	scsi_unregister_host(&nsp32_template);
-#endif
}


Index: linux-2.6.13-rc2-mm1/drivers/scsi/nsp32.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/nsp32.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/nsp32.h
@@ -618,47 +618,5 @@ typedef struct _nsp32_hw_data {
#define REQSACK_TIMEOUT_TIME	10000	/* max wait time for REQ/SACK assertion
or negation, 10000us == 10ms */

-/**************************************************************************
- * Compatibility functions
- */
-
-/* for Kernel 2.4 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-# define scsi_register_host(template) 	scsi_register_module(MODULE_SCSI_HA, template)
-# define scsi_unregister_host(template) scsi_unregister_module(MODULE_SCSI_HA, template)
-# define scsi_host_put(host)            scsi_unregister(host)
-# define pci_name(pci_dev)              ((pci_dev)->slot_name)
-
-typedef void irqreturn_t;
-# define IRQ_NONE      /* */
-# define IRQ_HANDLED   /* */
-# define IRQ_RETVAL(x) /* */
-
-/* This is ad-hoc version of scsi_host_get_next() */
-static inline struct Scsi_Host *scsi_host_get_next(struct Scsi_Host *host)
-{
-	if (host == NULL) {
-		return scsi_hostlist;
-	} else {
-		return host->next;
-	}
-}
-
-/* This is ad-hoc version of scsi_host_hn_get() */
-static inline struct Scsi_Host *scsi_host_hn_get(unsigned short hostno)
-{
-	struct Scsi_Host *host;
-
-	for (host = scsi_host_get_next(NULL); host != NULL;
-	     host = scsi_host_get_next(host)) {
-		if (host->host_no == hostno) {
-			break;
-		}
-	}
-
-	return host;
-}
-#endif
-
#endif /* _NSP32_H */
/* end */

[PATCH 46/82] remove unused drivers/scsi/pci2000.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
pci2000.h is unused, so drop the whole file

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/pci2000.h |  200 -------------------------------------------------
1 files changed, 200 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/pci2000.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/pci2000.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/****************************************************************************
- * Perceptive Solutions, Inc. PCI-2000 device driver for Linux.
- *
- * pci2000.h - Linux Host Driver for PCI-2000 IntelliCache SCSI Adapters
- *
- * Copyright (c) 1997-1999 Perceptive Solutions, Inc.
- * All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that redistributions of source
- * code retain the above copyright notice and this comment without
- * modification.
- *
- * Technical updates and product information at:
- *  http://www.psidisk.com
- *
- * Please send questions, comments, bug reports to:
- *  tech@psidisk.com Technical Support
- *
- ****************************************************************************/
-#ifndef _PCI2000_H
-#define _PCI2000_H
-
-#include <linux/types.h>
-
-#ifndef	PSI_EIDE_SCSIOP
-#define	PSI_EIDE_SCSIOP	1
-
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif
-#define	LINUXVERSION(v,p,s)    (((v)<<16) + ((p)<<8) + (s))
-
-/************************************************/
-/*		definition of standard data types		*/
-/************************************************/
-#define	CHAR	char
-#define	UCHAR	unsigned char
-#define	SHORT	short
-#define	USHORT	unsigned short
-#define	BOOL	long
-#define	LONG	long
-#define	ULONG	unsigned long
-#define	VOID	void
-
-typedef	CHAR	*PCHAR;
-typedef	UCHAR	*PUCHAR;
-typedef	SHORT	*PSHORT;
-typedef	USHORT	*PUSHORT;
-typedef	BOOL	*PBOOL;
-typedef	LONG	*PLONG;
-typedef	ULONG	*PULONG;
-typedef	VOID	*PVOID;
-
-
-/************************************************/
-/*		Misc. macros			 				*/
-/************************************************/
-#define ANY2SCSI(up, p)					-((UCHAR *)up)[0] = (((ULONG)(p)) >> 8);	-((UCHAR *)up)[1] = ((ULONG)(p));
-
-#define SCSI2LONG(up)					-( (((long)*(((UCHAR *)up))) << 16)		-+ (((long)(((UCHAR *)up)[1])) << 8)		-+ ((long)(((UCHAR *)up)[2])) )
-
-#define XANY2SCSI(up, p)				-((UCHAR *)up)[0] = ((long)(p)) >> 24;	-((UCHAR *)up)[1] = ((long)(p)) >> 16;	-((UCHAR *)up)[2] = ((long)(p)) >> 8;	-((UCHAR *)up)[3] = ((long)(p));
-
-#define XSCSI2LONG(up)					-( (((long)(((UCHAR *)up)[0])) << 24)	-+ (((long)(((UCHAR *)up)[1])) << 16)	-+ (((long)(((UCHAR *)up)[2])) <<  8)	-+ ((long)(((UCHAR *)up)[3])) )
-
-/************************************************/
-/*		SCSI CDB operation codes 				*/
-/************************************************/
-#define SCSIOP_TEST_UNIT_READY		0x00
-#define SCSIOP_REZERO_UNIT			0x01
-#define SCSIOP_REWIND				0x01
-#define SCSIOP_REQUEST_BLOCK_ADDR	0x02
-#define SCSIOP_REQUEST_SENSE		0x03
-#define SCSIOP_FORMAT_UNIT			0x04
-#define SCSIOP_READ_BLOCK_LIMITS	0x05
-#define SCSIOP_REASSIGN_BLOCKS		0x07
-#define SCSIOP_READ6				0x08
-#define SCSIOP_RECEIVE				0x08
-#define SCSIOP_WRITE6				0x0A
-#define SCSIOP_PRINT				0x0A
-#define SCSIOP_SEND					0x0A
-#define SCSIOP_SEEK6				0x0B
-#define SCSIOP_TRACK_SELECT			0x0B
-#define SCSIOP_SLEW_PRINT			0x0B
-#define SCSIOP_SEEK_BLOCK			0x0C
-#define SCSIOP_PARTITION			0x0D
-#define SCSIOP_READ_REVERSE			0x0F
-#define SCSIOP_WRITE_FILEMARKS		0x10
-#define SCSIOP_FLUSH_BUFFER			0x10
-#define SCSIOP_SPACE				0x11
-#define SCSIOP_INQUIRY				0x12
-#define SCSIOP_VERIFY6				0x13
-#define SCSIOP_RECOVER_BUF_DATA		0x14
-#define SCSIOP_MODE_SELECT			0x15
-#define SCSIOP_RESERVE_UNIT			0x16
-#define SCSIOP_RELEASE_UNIT			0x17
-#define SCSIOP_COPY					0x18
-#define SCSIOP_ERASE				0x19
-#define SCSIOP_MODE_SENSE			0x1A
-#define SCSIOP_START_STOP_UNIT		0x1B
-#define SCSIOP_STOP_PRINT			0x1B
-#define SCSIOP_LOAD_UNLOAD			0x1B
-#define SCSIOP_RECEIVE_DIAGNOSTIC	0x1C
-#define SCSIOP_SEND_DIAGNOSTIC		0x1D
-#define SCSIOP_MEDIUM_REMOVAL		0x1E
-#define SCSIOP_READ_CAPACITY		0x25
-#define SCSIOP_READ					0x28
-#define SCSIOP_WRITE				0x2A
-#define SCSIOP_SEEK					0x2B
-#define SCSIOP_LOCATE				0x2B
-#define SCSIOP_WRITE_VERIFY			0x2E
-#define SCSIOP_VERIFY				0x2F
-#define SCSIOP_SEARCH_DATA_HIGH		0x30
-#define SCSIOP_SEARCH_DATA_EQUAL	0x31
-#define SCSIOP_SEARCH_DATA_LOW		0x32
-#define SCSIOP_SET_LIMITS			0x33
-#define SCSIOP_READ_POSITION		0x34
-#define SCSIOP_SYNCHRONIZE_CACHE	0x35
-#define SCSIOP_COMPARE				0x39
-#define SCSIOP_COPY_COMPARE			0x3A
-#define SCSIOP_WRITE_DATA_BUFF		0x3B
-#define SCSIOP_READ_DATA_BUFF		0x3C
-#define SCSIOP_CHANGE_DEFINITION	0x40
-#define SCSIOP_READ_SUB_CHANNEL		0x42
-#define SCSIOP_READ_TOC				0x43
-#define SCSIOP_READ_HEADER			0x44
-#define SCSIOP_PLAY_AUDIO			0x45
-#define SCSIOP_PLAY_AUDIO_MSF		0x47
-#define SCSIOP_PLAY_TRACK_INDEX		0x48
-#define SCSIOP_PLAY_TRACK_RELATIVE	0x49
-#define SCSIOP_PAUSE_RESUME			0x4B
-#define SCSIOP_LOG_SELECT			0x4C
-#define SCSIOP_LOG_SENSE			0x4D
-#define SCSIOP_MODE_SELECT10		0x55
-#define SCSIOP_MODE_SENSE10			0x5A
-#define SCSIOP_LOAD_UNLOAD_SLOT		0xA6
-#define SCSIOP_MECHANISM_STATUS		0xBD
-#define SCSIOP_READ_CD				0xBE
-
-// SCSI read capacity structure
-typedef	struct _READ_CAPACITY_DATA
-	{
-	ULONG blks;				/* total blocks (converted to little endian) */
-	ULONG blksiz;			/* size of each (converted to little endian) */
-	}	READ_CAPACITY_DATA, *PREAD_CAPACITY_DATA;
-
-// SCSI inquiry data
-typedef struct _INQUIRYDATA
-	{
-	UCHAR DeviceType			:5;
-	UCHAR DeviceTypeQualifier	:3;
-	UCHAR DeviceTypeModifier	:7;
-	UCHAR RemovableMedia		:1;
-    UCHAR Versions;
-    UCHAR ResponseDataFormat;
-    UCHAR AdditionalLength;
-    UCHAR Reserved[2];
-	UCHAR SoftReset				:1;
-	UCHAR CommandQueue			:1;
-	UCHAR Reserved2				:1;
-	UCHAR LinkedCommands		:1;
-	UCHAR Synchronous			:1;
-	UCHAR Wide16Bit				:1;
-	UCHAR Wide32Bit				:1;
-	UCHAR RelativeAddressing	:1;
-    UCHAR VendorId[8];
-    UCHAR ProductId[16];
-    UCHAR ProductRevisionLevel[4];
-    UCHAR VendorSpecific[20];
-    UCHAR Reserved3[40];
-	}	INQUIRYDATA, *PINQUIRYDATA;
-
-#endif
-
-// function prototypes
-int Pci2000_Detect			(Scsi_Host_Template *tpnt);
-int Pci2000_Command			(Scsi_Cmnd *SCpnt);
-int Pci2000_QueueCommand	(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *));
-int Pci2000_Abort			(Scsi_Cmnd *SCpnt);
-int Pci2000_Reset			(Scsi_Cmnd *SCpnt, unsigned int flags);
-int Pci2000_Release			(struct Scsi_Host *pshost);
-int Pci2000_BiosParam		(struct scsi_device *sdev,
-					struct block_device *bdev,
-					sector_t capacity, int geom[]);
-
-#endif

[PATCH 47/82] remove linux/version.h from drivers/scsi/pcmcia/nsp*

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernel versions

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/pcmcia/nsp_cs.c |  158 -------------------------------------------
drivers/scsi/pcmcia/nsp_cs.h |   68 ------------------
2 files changed, 226 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/pcmcia/nsp_cs.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/pcmcia/nsp_cs.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/pcmcia/nsp_cs.c
@@ -27,7 +27,6 @@

/* $Id: nsp_cs.c,v 1.23 2003/08/18 11:09:19 elca Exp $ */

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@ -85,10 +84,6 @@ static Scsi_Host_Template nsp_driver_tem
.proc_name	         = "nsp_cs",
.proc_info		 = nsp_proc_info,
.name			 = "WorkBit NinjaSCSI-3/32Bi(16bit)",
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-	.detect			 = nsp_detect_old,
-	.release		 = nsp_release_old,
-#endif
.info			 = nsp_info,
.queuecommand		 = nsp_queuecommand,
/*	.eh_abort_handler	 = nsp_eh_abort,*/
@@ -99,9 +94,6 @@ static Scsi_Host_Template nsp_driver_tem
.sg_tablesize		 = SG_ALL,
.cmd_per_lun		 = 1,
.use_clustering		 = DISABLE_CLUSTERING,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2))
-	.use_new_eh_code	 = 1,
-#endif
};

static dev_link_t *dev_list = NULL;
@@ -1316,11 +1308,7 @@ static struct Scsi_Host *nsp_detect(Scsi
nsp_hw_data *data_b = &nsp_data_base, *data;

nsp_dbg(NSP_DEBUG_INIT, "this_id=%d", sht->this_id);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
host = scsi_host_alloc(&nsp_driver_template, sizeof(nsp_hw_data));
-#else
-	host = scsi_register(sht, sizeof(nsp_hw_data));
-#endif
if (host == NULL) {
nsp_dbg(NSP_DEBUG_INIT, "host failed");
return NULL;
@@ -1357,37 +1345,6 @@ static struct Scsi_Host *nsp_detect(Scsi
return host; /* detect done. */
}

-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int nsp_detect_old(Scsi_Host_Template *sht)
-{
-	if (nsp_detect(sht) == NULL) {
-		return 0;
-	} else {
-		//MOD_INC_USE_COUNT;
-		return 1;
-	}
-}
-
-
-static int nsp_release_old(struct Scsi_Host *shpnt)
-{
-	//nsp_hw_data *data = (nsp_hw_data *)shpnt->hostdata;
-
-	/* PCMCIA Card Service dose same things below. */
-	/* So we do nothing.                           */
-	//if (shpnt->irq) {
-	//	free_irq(shpnt->irq, data->ScsiInfo);
-	//}
-	//if (shpnt->io_port) {
-	//	release_region(shpnt->io_port, shpnt->n_io_port);
-	//}
-
-	//MOD_DEC_USE_COUNT;
-
-	return 0;
-}
-#endif
-
/*----------------------------------------------------------------*/
/* return info string						  */
/*----------------------------------------------------------------*/
@@ -1408,16 +1365,11 @@ static const char *nsp_info(struct Scsi_
} while(0)
static int
nsp_proc_info(
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
struct Scsi_Host *host,
-#endif
char  *buffer,
char **start,
off_t  offset,
int    length,
-#if !(LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
-	int    hostno,
-#endif
int    inout)
{
int id;
@@ -1426,24 +1378,12 @@ nsp_proc_info(
int speed;
unsigned long flags;
nsp_hw_data *data;
-#if !(LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
-	struct Scsi_Host *host;
-#else
int hostno;
-#endif
if (inout) {
return -EINVAL;
}

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
hostno = host->host_no;
-#else
-	/* search this HBA host */
-	host = scsi_host_hn_get(hostno);
-	if (host == NULL) {
-		return -ESRCH;
-	}
-#endif
data = (nsp_hw_data *)host->hostdata;


@@ -1716,10 +1656,6 @@ static void nsp_cs_config(dev_link_t *li
cistpl_cftable_entry_t dflt = { 0 };
struct Scsi_Host *host;
nsp_hw_data      *data = &nsp_data_base;
-#if !(LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,74))
-	Scsi_Device	 *dev;
-	dev_node_t	**tail, *node;
-#endif

nsp_dbg(NSP_DEBUG_INIT, "in");

@@ -1865,17 +1801,7 @@ static void nsp_cs_config(dev_link_t *li
goto cs_failed;
}

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,2))
host = nsp_detect(&nsp_driver_template);
-#else
-	scsi_register_host(&nsp_driver_template);
-	for (host = scsi_host_get_next(NULL); host != NULL;
-	     host = scsi_host_get_next(host)) {
-		if (host->hostt == &nsp_driver_template) {
-			break;
-		}
-	}
-#endif

if (host == NULL) {
nsp_dbg(NSP_DEBUG_INIT, "detect failed");
@@ -1883,7 +1809,6 @@ static void nsp_cs_config(dev_link_t *li
}


-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,74))
scsi_add_host (host, NULL);
scsi_scan_host(host);

@@ -1891,52 +1816,6 @@ static void nsp_cs_config(dev_link_t *li
link->dev  = &info->node;
info->host = host;

-#else
-	nsp_dbg(NSP_DEBUG_INIT, "GET_SCSI_INFO");
-	tail = &link->dev;
-	info->ndev = 0;
-
-	nsp_dbg(NSP_DEBUG_INIT, "host=0x%p", host);
-
-	for (dev = host->host_queue; dev != NULL; dev = dev->next) {
-		unsigned long id;
-		id = (dev->id & 0x0f) + ((dev->lun & 0x0f) << 4) +
-			((dev->channel & 0x0f) << 8) +
-			((dev->host->host_no & 0x0f) << 12);
-		node = &info->node[info->ndev];
-		node->minor = 0;
-		switch (dev->type) {
-		case TYPE_TAPE:
-			node->major = SCSI_TAPE_MAJOR;
-			snprintf(node->dev_name, sizeof(node->dev_name), "st#%04lx", id);
-			break;
-		case TYPE_DISK:
-		case TYPE_MOD:
-			node->major = SCSI_DISK0_MAJOR;
-			snprintf(node->dev_name, sizeof(node->dev_name), "sd#%04lx", id);
-			break;
-		case TYPE_ROM:
-		case TYPE_WORM:
-			node->major = SCSI_CDROM_MAJOR;
-			snprintf(node->dev_name, sizeof(node->dev_name), "sr#%04lx", id);
-			break;
-		default:
-			node->major = SCSI_GENERIC_MAJOR;
-			snprintf(node->dev_name, sizeof(node->dev_name), "sg#%04lx", id);
-			break;
-		}
-		*tail = node; tail = &node->next;
-		info->ndev++;
-		info->host = dev->host;
-	}
-
-	*tail = NULL;
-	if (info->ndev == 0) {
-		nsp_msg(KERN_INFO, "no SCSI devices found");
-	}
-	nsp_dbg(NSP_DEBUG_INIT, "host=0x%p", host);
-#endif
-
/* Finally, report what we've done */
printk(KERN_INFO "nsp_cs: index 0x%02x: Vcc %d.%d",
link->conf.ConfigIndex,
@@ -1991,13 +1870,9 @@ static void nsp_cs_release(dev_link_t *l
nsp_dbg(NSP_DEBUG_INIT, "link=0x%p", link);

/* Unlink the device chain */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2))
if (info->host != NULL) {
scsi_remove_host(info->host);
}
-#else
-	scsi_unregister_host(&nsp_driver_template);
-#endif
link->dev = NULL;

if (link->win) {
@@ -2014,11 +1889,9 @@ static void nsp_cs_release(dev_link_t *l
pcmcia_release_irq(link->handle, &link->irq);
}
link->state &= ~DEV_CONFIG;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2))
if (info->host != NULL) {
scsi_host_put(info->host);
}
-#endif
} /* nsp_cs_release */

/*======================================================================
@@ -2057,9 +1930,6 @@ static int nsp_cs_event(event_t
case CS_EVENT_CARD_INSERTION:
nsp_dbg(NSP_DEBUG_INIT, "event: insert");
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,68))
-		info->bus    =  args->bus;
-#endif
nsp_cs_config(link);
break;

@@ -2118,7 +1988,6 @@ static int nsp_cs_event(event_t
/*======================================================================*
*	module entry point
*====================================================================*/
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,68))
static struct pcmcia_device_id nsp_cs_ids[] = {
PCMCIA_DEVICE_PROD_ID123("IO DATA", "CBSC16       ", "1", 0x547e66dc, 0x0d63a3fd, 0x51de003a),
PCMCIA_DEVICE_PROD_ID123("KME    ", "SCSI-CARD-001", "1", 0x534c02bc, 0x52008408, 0x51de003a),
@@ -2141,47 +2010,20 @@ static struct pcmcia_driver nsp_driver =
.detach		= nsp_cs_detach,
.id_table	= nsp_cs_ids,
};
-#endif

static int __init nsp_cs_init(void)
{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,68))
nsp_msg(KERN_INFO, "loading...");

return pcmcia_register_driver(&nsp_driver);
-#else
-	servinfo_t serv;
-
-	nsp_msg(KERN_INFO, "loading...");
-	pcmcia_get_card_services_info(&serv);
-	if (serv.Revision != CS_RELEASE_CODE) {
-		nsp_msg(KERN_DEBUG, "Card Services release does not match!");
-		return -EINVAL;
-	}
-	register_pcmcia_driver(&dev_info, &nsp_cs_attach, &nsp_cs_detach);
-
-	nsp_dbg(NSP_DEBUG_INIT, "out");
-	return 0;
-#endif
}

static void __exit nsp_cs_exit(void)
{
nsp_msg(KERN_INFO, "unloading...");

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,68))
pcmcia_unregister_driver(&nsp_driver);
BUG_ON(dev_list != NULL);
-#else
-	unregister_pcmcia_driver(&dev_info);
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL) {
-		if (dev_list->state & DEV_CONFIG) {
-			nsp_cs_release(dev_list);
-		}
-		nsp_cs_detach(dev_list);
-	}
-#endif
}


Index: linux-2.6.13-rc2-mm1/drivers/scsi/pcmcia/nsp_cs.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/pcmcia/nsp_cs.h
+++ linux-2.6.13-rc2-mm1/drivers/scsi/pcmcia/nsp_cs.h
@@ -227,13 +227,7 @@
typedef struct scsi_info_t {
dev_link_t             link;
struct Scsi_Host      *host;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,74))
dev_node_t             node;
-#else
-	int	               ndev;
-	dev_node_t             node[8];
-	struct bus_operations *bus;
-#endif
int                    stop;
} scsi_info_t;

@@ -304,22 +298,13 @@ static int         nsp_cs_event  (event_

/* Linux SCSI subsystem specific functions */
static struct Scsi_Host *nsp_detect     (Scsi_Host_Template *sht);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static        int        nsp_detect_old (Scsi_Host_Template *sht);
-static        int        nsp_release_old(struct Scsi_Host *shpnt);
-#endif
static const  char      *nsp_info       (struct Scsi_Host *shpnt);
static        int        nsp_proc_info  (
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
struct Scsi_Host *host,
-#endif
char   *buffer,
char  **start,
off_t   offset,
int     length,
-#if !(LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
-					 int     hostno,
-#endif
int     inout);
static        int        nsp_queuecommand(Scsi_Cmnd *SCpnt, void (* done)(Scsi_Cmnd *SCpnt));

@@ -412,61 +397,8 @@ enum _burst_mode {
#define MSG_EXT_SDTR         0x01


-/**************************************************************************
- * Compatibility functions
- */
-
-/* for Kernel 2.4 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-#  define scsi_register_host(template)   scsi_register_module(MODULE_SCSI_HA, template)
-#  define scsi_unregister_host(template) scsi_unregister_module(MODULE_SCSI_HA, template)
-#  define scsi_host_put(host)            scsi_unregister(host)
-
-typedef void irqreturn_t;
-#  define IRQ_NONE      /* */
-#  define IRQ_HANDLED   /* */
-#  define IRQ_RETVAL(x) /* */
-
-/* This is ad-hoc version of scsi_host_get_next() */
-static inline struct Scsi_Host *scsi_host_get_next(struct Scsi_Host *host)
-{
-	if (host == NULL) {
-		return scsi_hostlist;
-	} else {
-		return host->next;
-	}
-}
-
-/* This is ad-hoc version of scsi_host_hn_get() */
-static inline struct Scsi_Host *scsi_host_hn_get(unsigned short hostno)
-{
-	struct Scsi_Host *host;
-
-	for (host = scsi_host_get_next(NULL); host != NULL;
-	     host = scsi_host_get_next(host)) {
-		if (host->host_no == hostno) {
-			break;
-		}
-	}
-
-	return host;
-}
-
-static void cs_error(client_handle_t handle, int func, int ret)
-{
-	error_info_t err = { func, ret };
-	pcmcia_report_error(handle, &err);
-}
-
-/* scatter-gather table */
-#  define BUFFER_ADDR (SCpnt->SCp.buffer->address)
-#endif
-
-/* for Kernel 2.6 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
/* scatter-gather table */
#  define BUFFER_ADDR ((char *)((unsigned int)(SCpnt->SCp.buffer->page) + SCpnt->SCp.buffer->offset))
-#endif

#endif  /*__nsp_cs__*/
/* end */

[PATCH 48/82] remove linux/version.h from drivers/scsi/qla1280.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/qla1280.c |  277 -------------------------------------------------
1 files changed, 277 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/qla1280.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/qla1280.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/qla1280.c
@@ -332,7 +332,6 @@
#include <linux/config.h>
#include <linux/module.h>

-#include <linux/version.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/errno.h>
@@ -356,28 +355,16 @@
#include <asm/types.h>
#include <asm/system.h>

-#if LINUX_VERSION_CODE >= 0x020545
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h>
-#else
-#include <linux/blk.h>
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-#include "sd.h"
-#endif

#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
#include <asm/sn/io.h>
#endif

-#if LINUX_VERSION_CODE < 0x020407
-#error "Kernels older than 2.4.7 are no longer supported"
-#endif
-
-
/*
* Compile time Options:
*            0 - Disable and 1 - Enable
@@ -441,52 +428,8 @@

#define NVRAM_DELAY()			udelay(500)	/* 2 microseconds */

-#if LINUX_VERSION_CODE < 0x020500
-#define HOST_LOCK			&io_request_lock
-#define irqreturn_t			void
-#define IRQ_RETVAL(foo)
-#define MSG_ORDERED_TAG			1
-
-#define DMA_BIDIRECTIONAL	SCSI_DATA_UNKNOWN
-#define DMA_TO_DEVICE		SCSI_DATA_WRITE
-#define DMA_FROM_DEVICE		SCSI_DATA_READ
-#define DMA_NONE		SCSI_DATA_NONE
-
-#ifndef HAVE_SECTOR_T
-typedef unsigned int sector_t;
-#endif
-
-static inline void
-scsi_adjust_queue_depth(struct scsi_device *device, int tag, int depth)
-{
-	if (tag) {
-		device->tagged_queue = tag;
-		device->current_tag = 0;
-	}
-	device->queue_depth = depth;
-}
-static inline struct Scsi_Host *scsi_host_alloc(Scsi_Host_Template *t, size_t s)
-{
-	return scsi_register(t, s);
-}
-static inline void scsi_host_put(struct Scsi_Host *h)
-{
-	scsi_unregister(h);
-}
-#else
#define HOST_LOCK			ha->host->host_lock
-#endif
-#if LINUX_VERSION_CODE < 0x020600
-#define DEV_SIMPLE_TAGS(device)		device->tagged_queue
-/*
- * Hack around that qla1280_remove_one is called from
- * qla1280_release in 2.4
- */
-#undef __devexit
-#define __devexit
-#else
#define DEV_SIMPLE_TAGS(device)		device->simple_tags
-#endif
#if defined(__ia64__) && !defined(ia64_platform_is)
#define ia64_platform_is(foo)		(!strcmp(x, platform_name))
#endif
@@ -506,9 +449,6 @@ static void qla1280_remove_one(struct pc
*  QLogic Driver Support Function Prototypes.
*/
static void qla1280_done(struct scsi_qla_host *);
-#if LINUX_VERSION_CODE < 0x020545
-static void qla1280_get_target_options(struct scsi_cmnd *, struct scsi_qla_host *);
-#endif
static int qla1280_get_token(char *);
static int qla1280_setup(char *s) __init;

@@ -610,11 +550,7 @@ __setup("qla1280=", qla1280_setup);
#define	CMD_SNSLEN(Cmnd)	sizeof(Cmnd->sense_buffer)
#define	CMD_RESULT(Cmnd)	Cmnd->result
#define	CMD_HANDLE(Cmnd)	Cmnd->host_scribble
-#if LINUX_VERSION_CODE < 0x020545
-#define CMD_REQUEST(Cmnd)	Cmnd->request.cmd
-#else
#define CMD_REQUEST(Cmnd)	Cmnd->request->cmd
-#endif

#define CMD_HOST(Cmnd)		Cmnd->device->host
#define SCSI_BUS_32(Cmnd)	Cmnd->device->channel
@@ -1179,97 +1115,6 @@ qla1280_biosparam(struct scsi_device *sd
return 0;
}

-#if LINUX_VERSION_CODE < 0x020600
-static int
-qla1280_detect(Scsi_Host_Template *template)
-{
-	struct pci_device_id *id = &qla1280_pci_tbl[0];
-	struct pci_dev *pdev = NULL;
-	int num_hosts = 0;
-
-	if (sizeof(struct srb) > sizeof(Scsi_Pointer)) {
-		printk(KERN_WARNING
-		       "qla1280: struct srb too big, abortingn");
-		return 0;
-	}
-
-	if ((DMA_BIDIRECTIONAL != PCI_DMA_BIDIRECTIONAL) ||
-	    (DMA_TO_DEVICE != PCI_DMA_TODEVICE) ||
-	    (DMA_FROM_DEVICE != PCI_DMA_FROMDEVICE) ||
-	    (DMA_NONE != PCI_DMA_NONE)) {
-		printk(KERN_WARNING
-		       "qla1280: dma direction bits don't matchn");
-		return 0;
-	}
-
-#ifdef MODULE
-	/*
-	 * If we are called as a module, the qla1280 pointer may not be null
-	 * and it would point to our bootup string, just like on the lilo
-	 * command line.  IF not NULL, then process this config string with
-	 * qla1280_setup
-	 *
-	 * Boot time Options
-	 * To add options at boot time add a line to your lilo.conf file like:
-	 * append="qla1280=verbose,max_tags:{{255,255,255,255},{255,255,255,255}}"
-	 * which will result in the first four devices on the first two
-	 * controllers being set to a tagged queue depth of 32.
-	 */
-	if (qla1280)
-		qla1280_setup(qla1280);
-#endif
-
-	/* First Initialize QLA12160 on PCI Bus 1 Dev 2 */
-	while ((pdev = pci_find_device(id->vendor, id->device, pdev))) {
-		if (pdev->bus->number == 1 && PCI_SLOT(pdev->devfn) == 2) {
-			if (!qla1280_probe_one(pdev, id))
-				num_hosts++;
-		}
-	}
-
-	pdev = NULL;
-	/* Try and find each different type of adapter we support */
-	for (id = &qla1280_pci_tbl[0]; id->device; id++) {
-		while ((pdev = pci_find_device(id->vendor, id->device, pdev))) {
-			/*
-			 * skip QLA12160 already initialized on
-			 * PCI Bus 1 Dev 2 since we already initialized
-			 * and presented it
-			 */
-			if (id->device == PCI_DEVICE_ID_QLOGIC_ISP12160 &&
-			    pdev->bus->number == 1 &&
-			    PCI_SLOT(pdev->devfn) == 2)
-				continue;
-
-			if (!qla1280_probe_one(pdev, id))
-				num_hosts++;
-		}
-	}
-
-	return num_hosts;
-}
-
-/*
- * This looks a bit ugly as we could just pass down host to
- * qla1280_remove_one, but I want to keep qla1280_release purely a wrapper
- * around pci_driver::remove as used from 2.6 onwards.
- */
-static int
-qla1280_release(struct Scsi_Host *host)
-{
-	struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
-
-	qla1280_remove_one(ha->pdev);
-	return 0;
-}
-
-static int
-qla1280_biosparam_old(Disk * disk, kdev_t dev, int geom[])
-{
-	return qla1280_biosparam(disk->device, NULL, disk->capacity, geom);
-}
-#endif
-
/**************************************************************************
* qla1280_intr_handler
*   Handles the H/W interrupt
@@ -1388,11 +1233,9 @@ qla1280_slave_configure(struct scsi_devi
scsi_adjust_queue_depth(device, 0, default_depth);
}

-#if LINUX_VERSION_CODE > 0x020500
nv->bus[bus].target[target].parameter.f.enable_sync = device->sdtr;
nv->bus[bus].target[target].parameter.f.enable_wide = device->wdtr;
nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr = device->ppr;
-#endif

if (driver_setup.no_sync ||
(driver_setup.sync_mask &&
@@ -1417,31 +1260,6 @@ qla1280_slave_configure(struct scsi_devi
return status;
}

-#if LINUX_VERSION_CODE < 0x020545
-/**************************************************************************
- *   qla1280_select_queue_depth
- *
- *   Sets the queue depth for each SCSI device hanging off the input
- *   host adapter.  We use a queue depth of 2 for devices that do not
- *   support tagged queueing.
- **************************************************************************/
-static void
-qla1280_select_queue_depth(struct Scsi_Host *host, struct scsi_device *sdev_q)
-{
-	struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
-	struct scsi_device *sdev;
-
-	ENTER("qla1280_select_queue_depth");
-	for (sdev = sdev_q; sdev; sdev = sdev->next)
-		if (sdev->host == host)
-			qla1280_slave_configure(sdev);
-
-	if (sdev_q)
-		qla1280_check_for_dead_scsi_bus(ha, sdev_q->channel);
-	LEAVE("qla1280_select_queue_depth");
-}
-#endif
-
/*
* qla1280_done
*      Process completed commands.
@@ -1501,10 +1319,6 @@ qla1280_done(struct scsi_qla_host *ha)
CMD_HANDLE(sp->cmd) = (unsigned char *)INVALID_HANDLE;
ha->actthreads--;

-#if LINUX_VERSION_CODE < 0x020500
-		if (cmd->cmnd[0] == INQUIRY)
-			qla1280_get_target_options(cmd, ha);
-#endif
(*(cmd)->scsi_done)(cmd);

if(sp->wait != NULL)
@@ -1667,9 +1481,7 @@ qla1280_initialize_adapter(struct scsi_q
struct device_reg __iomem *reg;
int status;
int bus;
-#if LINUX_VERSION_CODE > 0x020500
unsigned long flags;
-#endif

ENTER("qla1280_initialize_adapter");

@@ -1708,7 +1520,6 @@ qla1280_initialize_adapter(struct scsi_q
"NVRAMn");
}

-#if LINUX_VERSION_CODE >= 0x020500
/*
* It's necessary to grab the spin here as qla1280_mailbox_command
* needs to be able to drop the lock unconditionally to wait
@@ -1716,7 +1527,6 @@ qla1280_initialize_adapter(struct scsi_q
* In 2.4 ->detect is called with the io_request_lock held.
*/
spin_lock_irqsave(HOST_LOCK, flags);
-#endif

status = qla1280_load_firmware(ha);
if (status) {
@@ -1748,9 +1558,7 @@ qla1280_initialize_adapter(struct scsi_q

ha->flags.online = 1;
out:
-#if LINUX_VERSION_CODE >= 0x020500
spin_unlock_irqrestore(HOST_LOCK, flags);
-#endif
if (status)
dprintk(2, "qla1280_initialize_adapter: **** FAILED ****n");

@@ -3967,51 +3775,6 @@ qla1280_rst_aen(struct scsi_qla_host *ha
LEAVE("qla1280_rst_aen");
}

-
-#if LINUX_VERSION_CODE < 0x020500
-/*
- *
- */
-static void
-qla1280_get_target_options(struct scsi_cmnd *cmd, struct scsi_qla_host *ha)
-{
-	unsigned char *result;
-	struct nvram *n;
-	int bus, target, lun;
-
-	bus = SCSI_BUS_32(cmd);
-	target = SCSI_TCN_32(cmd);
-	lun = SCSI_LUN_32(cmd);
-
-	/*
-	 * Make sure to not touch anything if someone is using the
-	 * sg interface.
-	 */
-	if (cmd->use_sg || (CMD_RESULT(cmd) >> 16) != DID_OK || lun)
-		return;
-
-	result = cmd->request_buffer;
-	n = &ha->nvram;
-
-	n->bus[bus].target[target].parameter.f.enable_wide = 0;
-	n->bus[bus].target[target].parameter.f.enable_sync = 0;
-	n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 0;
-
-        if (result[7] & 0x60)
-		n->bus[bus].target[target].parameter.f.enable_wide = 1;
-        if (result[7] & 0x10)
-		n->bus[bus].target[target].parameter.f.enable_sync = 1;
-	if ((result[2] >= 3) && (result[4] + 5 > 56) &&
-	    (result[56] & 0x4))
-		n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 1;
-
-	dprintk(2, "get_target_options(): wide %i, sync %i, ppr %in",
-		n->bus[bus].target[target].parameter.f.enable_wide,
-		n->bus[bus].target[target].parameter.f.enable_sync,
-		n->bus[bus].target[target].ppr_1x160.flags.enable_ppr);
-}
-#endif
-
/*
*  qla1280_status_entry
*      Processes received ISP status entry.
@@ -4564,7 +4327,6 @@ qla1280_get_token(char *str)
return ret;
}

-#if LINUX_VERSION_CODE >= 0x020600
static struct scsi_host_template qla1280_driver_template = {
.module			= THIS_MODULE,
.proc_name		= "qla1280",
@@ -4583,27 +4345,6 @@ static struct scsi_host_template qla1280
.cmd_per_lun		= 1,
.use_clustering		= ENABLE_CLUSTERING,
};
-#else
-static Scsi_Host_Template qla1280_driver_template = {
-	.proc_name		= "qla1280",
-	.name			= "Qlogic ISP 1280/12160",
-	.detect			= qla1280_detect,
-	.release		= qla1280_release,
-	.info			= qla1280_info,
-	.queuecommand		= qla1280_queuecommand,
-	.eh_abort_handler	= qla1280_eh_abort,
-	.eh_device_reset_handler= qla1280_eh_device_reset,
-	.eh_bus_reset_handler	= qla1280_eh_bus_reset,
-	.eh_host_reset_handler	= qla1280_eh_adapter_reset,
-	.bios_param		= qla1280_biosparam_old,
-	.can_queue		= 0xfffff,
-	.this_id		= -1,
-	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun		= 1,
-	.use_clustering		= ENABLE_CLUSTERING,
-	.use_new_eh_code	= 1,
-};
-#endif

static int __devinit
qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
@@ -4694,10 +4435,6 @@ qla1280_probe_one(struct pci_dev *pdev,
host->max_sectors = 1024;
host->unique_id = host->host_no;

-#if LINUX_VERSION_CODE < 0x020545
-	host->select_queue_depths = qla1280_select_queue_depth;
-#endif
-
error = -ENODEV;

#if MEMORY_MAPPED_IO
@@ -4745,21 +4482,15 @@ qla1280_probe_one(struct pci_dev *pdev,

pci_set_drvdata(pdev, host);

-#if LINUX_VERSION_CODE >= 0x020600
error = scsi_add_host(host, &pdev->dev);
if (error)
goto error_disable_adapter;
scsi_scan_host(host);
-#else
-	scsi_set_pci_device(host, pdev);
-#endif

return 0;

-#if LINUX_VERSION_CODE >= 0x020600
error_disable_adapter:
WRT_REG_WORD(&ha->iobase->ictrl, 0);
-#endif
error_free_irq:
free_irq(pdev->irq, ha);
error_release_region:
@@ -4791,9 +4522,7 @@ qla1280_remove_one(struct pci_dev *pdev)
struct Scsi_Host *host = pci_get_drvdata(pdev);
struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;

-#if LINUX_VERSION_CODE >= 0x020600
scsi_remove_host(host);
-#endif

WRT_REG_WORD(&ha->iobase->ictrl, 0);

@@ -4817,7 +4546,6 @@ qla1280_remove_one(struct pci_dev *pdev)
scsi_host_put(host);
}

-#if LINUX_VERSION_CODE >= 0x020600
static struct pci_driver qla1280_pci_driver = {
.name		= "qla1280",
.id_table	= qla1280_pci_tbl,
@@ -4863,11 +4591,6 @@ qla1280_exit(void)
module_init(qla1280_init);
module_exit(qla1280_exit);

-#else
-# define driver_template qla1280_driver_template
-# include "scsi_module.c"
-#endif
-
MODULE_AUTHOR("Qlogic & Jes Sorensen");
MODULE_DESCRIPTION("Qlogic ISP SCSI (qla1x80/qla1x160) driver");
MODULE_LICENSE("GPL");

[PATCH 49/82] remove linux/version.h from drivers/scsi/scsi_debug.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/scsi_debug.c |    4 ----
1 files changed, 4 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/scsi_debug.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/scsi_debug.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/scsi_debug.c
@@ -48,10 +48,6 @@

#include <linux/stat.h>

-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif
-
#include "scsi_logging.h"
#include "scsi_debug.h"

[PATCH 50/82] remove linux/version.h from drivers/scsi/sg.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/sg.c |    4 ----
1 files changed, 4 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/sg.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/sg.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/sg.c
@@ -67,10 +67,6 @@ static int sg_proc_init(void);
static void sg_proc_cleanup(void);
#endif

-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif				/* LINUX_VERSION_CODE */
-
#define SG_ALLOW_DIO_DEF 0
#define SG_ALLOW_DIO_CODE /* compile out by commenting this define */

[PATCH 51/82] remove linux/version.h from drivers/scsi/sgiwd93.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/sgiwd93.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/sgiwd93.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/sgiwd93.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/sgiwd93.c
@@ -15,7 +15,6 @@
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/blkdev.h>
-#include <linux/version.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/spinlock.h>

[PATCH 52/82] remove linux/version.h from drivers/scsi/wd33c93.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/scsi/wd33c93.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/scsi/wd33c93.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/scsi/wd33c93.c
+++ linux-2.6.13-rc2-mm1/drivers/scsi/wd33c93.c
@@ -77,7 +77,6 @@
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/delay.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/blkdev.h>
#include <asm/irq.h>

[PATCH 53/82] remove linux/version.h from drivers/serial/crisv10.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/serial/crisv10.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/serial/crisv10.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/serial/crisv10.c
+++ linux-2.6.13-rc2-mm1/drivers/serial/crisv10.c
@@ -426,7 +426,6 @@
static char *serial_version = "$Revision: 1.25 $";

#include <linux/config.h>
-#include <linux/version.h>

#include <linux/types.h>
#include <linux/errno.h>

[PATCH 54/82] remove linux/version.h from drivers/serial/crisv32.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/serial/crisv32.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/serial/crisv32.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/serial/crisv32.c
+++ linux-2.6.13-rc2-mm1/drivers/serial/crisv32.c
@@ -198,7 +198,6 @@
static char *serial_version = "$Revision: 1.50 $";

#include <linux/config.h>
-#include <linux/version.h>

#include <linux/types.h>
#include <linux/errno.h>

[PATCH 55/82] remove linux/version.h from drivers/serial/icom.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/serial/icom.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/serial/icom.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/serial/icom.c
+++ linux-2.6.13-rc2-mm1/drivers/serial/icom.c
@@ -25,7 +25,6 @@
#define SERIAL_DO_RESTART
#include <linux/module.h>
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/signal.h>

[PATCH 56/82] remove linux/version.h from drivers/serial/jsm/jsm.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/serial/jsm/jsm.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/serial/jsm/jsm.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/serial/jsm/jsm.h
+++ linux-2.6.13-rc2-mm1/drivers/serial/jsm/jsm.h
@@ -28,7 +28,6 @@
#define __JSM_DRIVER_H

#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/types.h>	/* To pick up the varions Linux types */
#include <linux/tty.h>
#include <linux/serial_core.h>

[PATCH 57/82] remove linux/version.h from drivers/telephony/ixj.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/telephony/ixj.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/telephony/ixj.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/telephony/ixj.h
+++ linux-2.6.13-rc2-mm1/drivers/telephony/ixj.h
@@ -40,7 +40,6 @@
*****************************************************************************/
#define IXJ_VERSION 3031

-#include <linux/version.h>
#include <linux/types.h>

#include <linux/ixjuser.h>

[PATCH 58/82] remove linux/version.h from drivers/usb

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

remove code for obsolete kernels from drivers/usb/media/pwc/pwc-ctrl.c
and drivers/usb/misc/sisusbvga/sisusb.h

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/media/dvb/ttusb-dec/ttusb_dec.c |    1 -
drivers/usb/gadget/dummy_hcd.c          |    1 -
drivers/usb/gadget/lh7a40x_udc.h        |    1 -
drivers/usb/gadget/pxa2xx_udc.c         |    1 -
drivers/usb/gadget/rndis.c              |    1 -
drivers/usb/host/hc_crisv10.c           |    1 -
drivers/usb/media/pwc/pwc-ctrl.c        |   29 -----------------------------
drivers/usb/media/pwc/pwc-if.c          |    4 ----
drivers/usb/media/pwc/pwc.h             |    2 --
drivers/usb/media/w9968cf.c             |    1 -
drivers/usb/misc/sisusbvga/sisusb.c     |    1 -
drivers/usb/misc/sisusbvga/sisusb.h     |    5 -----
12 files changed, 48 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/ttusb-dec/ttusb_dec.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -28,7 +28,6 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/usb.h>
-#include <linux/version.h>
#include <linux/interrupt.h>
#include <linux/firmware.h>
#include <linux/crc32.h>
Index: linux-2.6.13-rc2-mm1/drivers/usb/gadget/dummy_hcd.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/gadget/dummy_hcd.c
+++ linux-2.6.13-rc2-mm1/drivers/usb/gadget/dummy_hcd.c
@@ -49,7 +49,6 @@
#include <linux/timer.h>
#include <linux/list.h>
#include <linux/interrupt.h>
-#include <linux/version.h>

#include <linux/usb.h>
#include <linux/usb_gadget.h>
Index: linux-2.6.13-rc2-mm1/drivers/usb/gadget/lh7a40x_udc.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/gadget/lh7a40x_udc.h
+++ linux-2.6.13-rc2-mm1/drivers/usb/gadget/lh7a40x_udc.h
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/ioport.h>
#include <linux/types.h>
-#include <linux/version.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/sched.h>
Index: linux-2.6.13-rc2-mm1/drivers/usb/gadget/pxa2xx_udc.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/gadget/pxa2xx_udc.c
+++ linux-2.6.13-rc2-mm1/drivers/usb/gadget/pxa2xx_udc.c
@@ -32,7 +32,6 @@
#include <linux/kernel.h>
#include <linux/ioport.h>
#include <linux/types.h>
-#include <linux/version.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/sched.h>
Index: linux-2.6.13-rc2-mm1/drivers/usb/gadget/rndis.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/gadget/rndis.c
+++ linux-2.6.13-rc2-mm1/drivers/usb/gadget/rndis.c
@@ -28,7 +28,6 @@
#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/errno.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/proc_fs.h>
Index: linux-2.6.13-rc2-mm1/drivers/usb/host/hc_crisv10.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/host/hc_crisv10.c
+++ linux-2.6.13-rc2-mm1/drivers/usb/host/hc_crisv10.c
@@ -14,7 +14,6 @@
#include <linux/unistd.h>
#include <linux/interrupt.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/list.h>
#include <linux/spinlock.h>

Index: linux-2.6.13-rc2-mm1/drivers/usb/media/pwc/pwc-ctrl.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/media/pwc/pwc-ctrl.c
+++ linux-2.6.13-rc2-mm1/drivers/usb/media/pwc/pwc-ctrl.c
@@ -41,7 +41,6 @@
#include <asm/uaccess.h>
#endif
#include <asm/errno.h>
-#include <linux/version.h>

#include "pwc.h"
#include "pwc-ioctl.h"
@@ -1152,15 +1151,6 @@ int pwc_get_cmos_sensor(struct pwc_devic
/* End of Add-Ons                                    */
/* ************************************************* */

-/* Linux 2.5.something and 2.6 pass direct pointers to arguments of
-   ioctl() calls. With 2.4, you have to do tedious copy_from_user()
-   and copy_to_user() calls. With these macros we circumvent this,
-   and let me maintain only one source file. The functionality is
-   exactly the same otherwise.
- */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-
/* define local variable for arg */
#define ARG_DEF(ARG_type, ARG_name) 	ARG_type *ARG_name = arg;
@@ -1173,25 +1163,6 @@ int pwc_get_cmos_sensor(struct pwc_devic
/* copy local variable to arg */
#define ARG_OUT(ARG_name) /* nothing */

-#else
-
-#define ARG_DEF(ARG_type, ARG_name)-	ARG_type ARG_name;
-#define ARG_IN(ARG_name)-	if (copy_from_user(&ARG_name, arg, sizeof(ARG_name))) {-		ret = -EFAULT;-		break;-	}
-#define ARGR(ARG_name) ARG_name
-#define ARGA(ARG_name) &ARG_name
-#define ARG_OUT(ARG_name)-	if (copy_to_user(arg, &ARG_name, sizeof(ARG_name))) {-		ret = -EFAULT;-		break;-	}
-
-#endif
-
int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
{
int ret = 0;
Index: linux-2.6.13-rc2-mm1/drivers/usb/media/pwc/pwc-if.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/media/pwc/pwc-if.c
+++ linux-2.6.13-rc2-mm1/drivers/usb/media/pwc/pwc-if.c
@@ -826,13 +826,9 @@ static int pwc_isoc_init(struct pwc_devi
/* Get the current alternate interface, adjust packet size */
if (!udev->actconfig)
return -EFAULT;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5)
-	idesc = &udev->actconfig->interface[0]->altsetting[pdev->valternate];
-#else
intf = usb_ifnum_to_if(udev, 0);
if (intf)
idesc = usb_altnum_to_altsetting(intf, pdev->valternate);
-#endif

if (!idesc)
return -EFAULT;
Index: linux-2.6.13-rc2-mm1/drivers/usb/media/pwc/pwc.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/media/pwc/pwc.h
+++ linux-2.6.13-rc2-mm1/drivers/usb/media/pwc/pwc.h
@@ -25,8 +25,6 @@
#ifndef PWC_H
#define PWC_H

-#include <linux/version.h>
-
#include <linux/config.h>
#include <linux/module.h>
#include <linux/usb.h>
Index: linux-2.6.13-rc2-mm1/drivers/usb/media/w9968cf.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/media/w9968cf.c
+++ linux-2.6.13-rc2-mm1/drivers/usb/media/w9968cf.c
@@ -25,7 +25,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
***************************************************************************/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/kmod.h>
Index: linux-2.6.13-rc2-mm1/drivers/usb/misc/sisusbvga/sisusb.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/misc/sisusbvga/sisusb.c
+++ linux-2.6.13-rc2-mm1/drivers/usb/misc/sisusbvga/sisusb.c
@@ -35,7 +35,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/signal.h>
Index: linux-2.6.13-rc2-mm1/drivers/usb/misc/sisusbvga/sisusb.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/misc/sisusbvga/sisusb.h
+++ linux-2.6.13-rc2-mm1/drivers/usb/misc/sisusbvga/sisusb.h
@@ -38,13 +38,8 @@
#define _SISUSB_H_

#ifdef CONFIG_COMPAT
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
-#include <linux/ioctl32.h>
-#define SISUSB_OLD_CONFIG_COMPAT
-#else
#define SISUSB_NEW_CONFIG_COMPAT
#endif
-#endif

/* Version Information */

[PATCH 59/82] remove linux/version.h from drivers/video/backlight/backlight.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/video/backlight/backlight.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/video/backlight/backlight.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/backlight/backlight.c
+++ linux-2.6.13-rc2-mm1/drivers/video/backlight/backlight.c
@@ -5,7 +5,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h>

[PATCH 60/82] remove linux/version.h from drivers/video/backlight/lcd.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/video/backlight/lcd.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/video/backlight/lcd.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/backlight/lcd.c
+++ linux-2.6.13-rc2-mm1/drivers/video/backlight/lcd.c
@@ -5,7 +5,6 @@
*
*/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h>

[PATCH 61/82] remove linux/version.h from drivers/video/intelfb/intelfb*

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/video/intelfb/intelfbdrv.c |    1 -
drivers/video/intelfb/intelfbhw.c  |    1 -
2 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/video/intelfb/intelfbdrv.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/intelfb/intelfbdrv.c
+++ linux-2.6.13-rc2-mm1/drivers/video/intelfb/intelfbdrv.c
@@ -126,7 +126,6 @@
#include <linux/kd.h>
#include <linux/vt_kern.h>
#include <linux/pagemap.h>
-#include <linux/version.h>

#include <asm/io.h>

Index: linux-2.6.13-rc2-mm1/drivers/video/intelfb/intelfbhw.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/intelfb/intelfbhw.c
+++ linux-2.6.13-rc2-mm1/drivers/video/intelfb/intelfbhw.c
@@ -38,7 +38,6 @@
#include <linux/kd.h>
#include <linux/vt_kern.h>
#include <linux/pagemap.h>
-#include <linux/version.h>

#include <asm/io.h>

[PATCH 62/82] remove linux/version.h from drivers/video/sis

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

remove code for obsolete kernels:
#error "This version of sisfb requires at least 2.6.3"

FBCON_HAS_CFB8, FBCON_HAS_CFB16 and FBCON_HAS_CFB32 is appearently from 2.4

there is odd code like:
-          outSISIDXREG(SISSR,0x14,0x??);  /* 8MB, 64bit default */
+          outSISIDXREG(SISSR,0x14,0x00);  /* 8MB, 64bit default */


Signed-off-by: Olaf Hering <olh@suse.de>

drivers/video/sis/init.h      |    5
drivers/video/sis/init301.h   |    5
drivers/video/sis/sis.h       |   46 --
drivers/video/sis/sis_accel.c |  171 ---------
drivers/video/sis/sis_accel.h |   13
drivers/video/sis/sis_main.c  |  784 ------------------------------------------
drivers/video/sis/sis_main.h  |   55 --
drivers/video/sis/vgatypes.h  |    3
8 files changed, 1 insertion(+), 1081 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/video/sis/init.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/sis/init.h
+++ linux-2.6.13-rc2-mm1/drivers/video/sis/init.h
@@ -68,16 +68,11 @@
#undef SIS_CP
#endif
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <asm/io.h>
#include <linux/fb.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/sisfb.h>
-#else
#include <video/sisfb.h>
#endif
-#endif

/* Mode numbers */
static const USHORT ModeIndex_320x200[]      = {0x59, 0x41, 0x00, 0x4f};
Index: linux-2.6.13-rc2-mm1/drivers/video/sis/init301.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/sis/init301.h
+++ linux-2.6.13-rc2-mm1/drivers/video/sis/init301.h
@@ -68,15 +68,10 @@
#undef SIS_CP
#endif
#include <linux/config.h>
-#include <linux/version.h>
#include <asm/io.h>
#include <linux/types.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/sisfb.h>
-#else
#include <video/sisfb.h>
#endif
-#endif

static const UCHAR SiS_YPbPrTable[3][64] = {
{
Index: linux-2.6.13-rc2-mm1/drivers/video/sis/sis.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/sis/sis.h
+++ linux-2.6.13-rc2-mm1/drivers/video/sis/sis.h
@@ -23,14 +23,9 @@
#define _SIS_H

#include <linux/config.h>
-#include <linux/version.h>

#include "osdef.h"
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#include <video/sisfb.h>
-#else
-#include <linux/sisfb.h>
-#endif

#include "vgatypes.h"
#include "vstruct.h"
@@ -41,29 +36,15 @@

#undef SIS_CONFIG_COMPAT

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#include <linux/spinlock.h>
#ifdef CONFIG_COMPAT
#include <linux/ioctl32.h>
#define SIS_CONFIG_COMPAT
#endif
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,19)
-#ifdef __x86_64__
-/* Shouldn't we check for CONFIG_IA32_EMULATION here? */
-#include <asm/ioctl32.h>
-#define SIS_CONFIG_COMPAT
-#endif
-#endif

-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
#define SIS_IOTYPE1 void __iomem
#define SIS_IOTYPE2 __iomem
#define SISINITSTATIC static
-#else
-#define SIS_IOTYPE1 unsigned char
-#define SIS_IOTYPE2
-#define SISINITSTATIC
-#endif

#undef SISFBDEBUG

@@ -382,26 +363,8 @@ struct sis_video_info {

struct fb_var_screeninfo default_var;

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
struct fb_fix_screeninfo sisfb_fix;
u32 		pseudo_palette[17];
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	struct display 		 sis_disp;
-	struct display_switch 	 sisfb_sw;
-	struct {
-		u16 red, green, blue, pad;
-	} 		sis_palette[256];
-	union {
-#ifdef FBCON_HAS_CFB16
-		u16 cfb16[16];
-#endif
-#ifdef FBCON_HAS_CFB32
-		u32 cfb32[16];
-#endif
-	} 		sis_fbcon_cmap;
-#endif

struct sisfb_monitor {
u16 hmin;
@@ -420,10 +383,6 @@ struct sis_video_info {

int		mni;	/* Mode number index */

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	int  		currcon;
-#endif
-
unsigned long	video_size;
unsigned long 	video_base;
unsigned long	mmio_size;
@@ -457,9 +416,6 @@ struct sis_video_info {
int		sisfb_tvstd;
int		sisfb_filter;
int		sisfb_nocrt2rate;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	int		sisfb_inverse;
-#endif

u32 		heapstart;        	/* offset  */
SIS_IOTYPE1  	*sisfb_heap_start; 	/* address */
@@ -520,9 +476,7 @@ struct sis_video_info {
int    		modechanged;
unsigned char 	modeprechange;

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
u8 		sisfb_lastrates[128];
-#endif

int  		newrom;
int  		registered;
Index: linux-2.6.13-rc2-mm1/drivers/video/sis/sis_accel.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/sis/sis_accel.c
+++ linux-2.6.13-rc2-mm1/drivers/video/sis/sis_accel.c
@@ -27,7 +27,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -41,14 +40,6 @@

#include <asm/io.h>

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <video/fbcon.h>
-#include <video/fbcon-cfb8.h>
-#include <video/fbcon-cfb16.h>
-#include <video/fbcon-cfb24.h>
-#include <video/fbcon-cfb32.h>
-#endif
-
#include "sis.h"
#include "sis_accel.h"

@@ -92,11 +83,9 @@ static const u8 sisPatALUConv[] =
0xFF,       /* dest = 0xFF;         1,      GXset,          0xF */
};

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)
static const int myrops[] = {
3, 10, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
};
-#endif

/* 300 series ----------------------------------------------------- */
#ifdef CONFIG_FB_SIS_300
@@ -312,8 +301,6 @@ void sisfb_syncaccel(struct sis_video_in
}
}

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)  /* --------------- 2.5 --------------- */
-
int fbcon_sis_sync(struct fb_info *info)
{
struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
@@ -447,71 +434,6 @@ void fbcon_sis_copyarea(struct fb_info *
}
}

-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)  /* -------------- 2.4 --------------- */
-
-void fbcon_sis_bmove(struct display *p, int srcy, int srcx,
-			    int dsty, int dstx, int height, int width)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)p->fb_info->par;
-
-	CRITFLAGS
-
-	if(!ivideo->accel) {
-	    switch(ivideo->video_bpp) {
-	    case 8:
-#ifdef FBCON_HAS_CFB8
-	       fbcon_cfb8_bmove(p, srcy, srcx, dsty, dstx, height, width);
-#endif
-	       break;
-	    case 16:
-#ifdef FBCON_HAS_CFB16
-	       fbcon_cfb16_bmove(p, srcy, srcx, dsty, dstx, height, width);
-#endif
-	       break;
-	    case 32:
-#ifdef FBCON_HAS_CFB32
-	       fbcon_cfb32_bmove(p, srcy, srcx, dsty, dstx, height, width);
-#endif
-	       break;
-            }
-	    return;
-	}
-
-	srcx *= fontwidth(p);
-	srcy *= fontheight(p);
-	dstx *= fontwidth(p);
-	dsty *= fontheight(p);
-	width *= fontwidth(p);
-	height *= fontheight(p);
-
-	if(ivideo->sisvga_engine == SIS_300_VGA) {
-#ifdef CONFIG_FB_SIS_300
-	   int xdir, ydir;
-
-	   if(srcx < dstx) xdir = 0;
-	   else            xdir = 1;
-	   if(srcy < dsty) ydir = 0;
-	   else            ydir = 1;
-
-	   CRITBEGIN
-	   SiS300SetupForScreenToScreenCopy(ivideo, xdir, ydir, 3, -1);
-	   SiS300SubsequentScreenToScreenCopy(ivideo, srcx, srcy, dstx, dsty, width, height);
-	   CRITEND
-	   SiS300Sync(ivideo);
-#endif
-	} else {
-#ifdef CONFIG_FB_SIS_315
-	   CRITBEGIN
-	   SiS310SetupForScreenToScreenCopy(ivideo, 3, -1);
-	   SiS310SubsequentScreenToScreenCopy(ivideo, srcx, srcy, dstx, dsty, width, height);
-	   CRITEND
-	   SiS310Sync(ivideo);
-#endif
-	}
-}
-
static void fbcon_sis_clear(struct vc_data *conp, struct display *p,
int srcy, int srcx, int height, int width, int color)
{
@@ -549,9 +471,6 @@ void fbcon_sis_clear8(struct vc_data *co
u32 bgx;

if(!ivideo->accel) {
-#ifdef FBCON_HAS_CFB8
-	    fbcon_cfb8_clear(conp, p, srcy, srcx, height, width);
-#endif
return;
}

@@ -566,9 +485,6 @@ void fbcon_sis_clear16(struct vc_data *c
u32 bgx;

if(!ivideo->accel) {
-#ifdef FBCON_HAS_CFB16
-	    fbcon_cfb16_clear(conp, p, srcy, srcx, height, width);
-#endif
return;
}

@@ -583,96 +499,9 @@ void fbcon_sis_clear32(struct vc_data *c
u32 bgx;

if(!ivideo->accel) {
-#ifdef FBCON_HAS_CFB32
-	    fbcon_cfb32_clear(conp, p, srcy, srcx, height, width);
-#endif
return;
}

bgx = ((u_int32_t*)p->dispsw_data)[attr_bgcol_ec(p, conp)];
fbcon_sis_clear(conp, p, srcy, srcx, height, width, bgx);
}
-
-void fbcon_sis_revc(struct display *p, int srcx, int srcy)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)p->fb_info->par;
-	CRITFLAGS
-
-	if(!ivideo->accel) {
-	    switch(ivideo->video_bpp) {
-	    case 16:
-#ifdef FBCON_HAS_CFB16
-	       fbcon_cfb16_revc(p, srcx, srcy);
-#endif
-	       break;
-	    case 32:
-#ifdef FBCON_HAS_CFB32
-	       fbcon_cfb32_revc(p, srcx, srcy);
-#endif
-	       break;
-            }
-	    return;
-	}
-
-	srcx *= fontwidth(p);
-	srcy *= fontheight(p);
-
-	if(ivideo->sisvga_engine == SIS_300_VGA) {
-#ifdef CONFIG_FB_SIS_300
-	   CRITBEGIN
-	   SiS300SetupForSolidFill(ivideo, 0, 0x0a);
-	   SiS300SubsequentSolidFillRect(ivideo, srcx, srcy, fontwidth(p), fontheight(p));
-	   CRITEND
-	   SiS300Sync(ivideo);
-#endif
-	} else {
-#ifdef CONFIG_FB_SIS_315
-	   CRITBEGIN
-	   SiS310SetupForSolidFill(ivideo, 0, 0x0a);
-	   SiS310SubsequentSolidFillRect(ivideo, srcx, srcy, fontwidth(p), fontheight(p));
-	   CRITEND
-	   SiS310Sync(ivideo);
-#endif
-	}
-}
-
-#ifdef FBCON_HAS_CFB8
-struct display_switch fbcon_sis8 = {
-	.setup		= fbcon_cfb8_setup,
-	.bmove		= fbcon_sis_bmove,
-	.clear		= fbcon_sis_clear8,
-	.putc		= fbcon_cfb8_putc,
-	.putcs		= fbcon_cfb8_putcs,
-	.revc		= fbcon_cfb8_revc,
-	.clear_margins	= fbcon_cfb8_clear_margins,
-	.fontwidthmask	= FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
-};
-#endif
-#ifdef FBCON_HAS_CFB16
-struct display_switch fbcon_sis16 = {
-	.setup		= fbcon_cfb16_setup,
-	.bmove		= fbcon_sis_bmove,
-	.clear		= fbcon_sis_clear16,
-	.putc		= fbcon_cfb16_putc,
-	.putcs		= fbcon_cfb16_putcs,
-	.revc		= fbcon_sis_revc,
-	.clear_margins	= fbcon_cfb16_clear_margins,
-	.fontwidthmask	= FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
-};
-#endif
-#ifdef FBCON_HAS_CFB32
-struct display_switch fbcon_sis32 = {
-	.setup		= fbcon_cfb32_setup,
-	.bmove		= fbcon_sis_bmove,
-	.clear		= fbcon_sis_clear32,
-	.putc		= fbcon_cfb32_putc,
-	.putcs		= fbcon_cfb32_putcs,
-	.revc		= fbcon_sis_revc,
-	.clear_margins	= fbcon_cfb32_clear_margins,
-	.fontwidthmask	= FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
-};
-#endif
-
-#endif /* KERNEL VERSION */
-
-
Index: linux-2.6.13-rc2-mm1/drivers/video/sis/sis_accel.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/sis/sis_accel.h
+++ linux-2.6.13-rc2-mm1/drivers/video/sis/sis_accel.h
@@ -390,20 +390,7 @@
int  sisfb_initaccel(struct sis_video_info *ivideo);
void sisfb_syncaccel(struct sis_video_info *ivideo);

-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,33)
-void fbcon_sis_bmove(struct display *p, int srcy, int srcx, int dsty,
-			int dstx, int height, int width);
-void fbcon_sis_revc(struct display *p, int srcy, int srcx);
-void fbcon_sis_clear8(struct vc_data *conp, struct display *p, int srcy,
-			int srcx, int height, int width);
-void fbcon_sis_clear16(struct vc_data *conp, struct display *p, int srcy,
-			int srcx, int height, int width);
-void fbcon_sis_clear32(struct vc_data *conp, struct display *p, int srcy,
-			int srcx, int height, int width);
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)
void fbcon_sis_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
void fbcon_sis_copyarea(struct fb_info *info, const struct fb_copyarea *area);
-#endif

#endif
Index: linux-2.6.13-rc2-mm1/drivers/video/sis/sis_main.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/sis/sis_main.c
+++ linux-2.6.13-rc2-mm1/drivers/video/sis/sis_main.c
@@ -33,11 +33,8 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#include <linux/moduleparam.h>
-#endif
#include <linux/kernel.h>
#include <linux/smp_lock.h>
#include <linux/spinlock.h>
@@ -65,35 +62,9 @@
#include <asm/mtrr.h>
#endif

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <video/fbcon.h>
-#include <video/fbcon-cfb8.h>
-#include <video/fbcon-cfb16.h>
-#include <video/fbcon-cfb24.h>
-#include <video/fbcon-cfb32.h>
-#endif
-
#include "sis.h"
#include "sis_main.h"

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,3)
-#error "This version of sisfb requires at least 2.6.3"
-#endif
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#ifdef FBCON_HAS_CFB8
-extern struct display_switch fbcon_sis8;
-#endif
-#ifdef FBCON_HAS_CFB16
-extern struct display_switch fbcon_sis16;
-#endif
-#ifdef FBCON_HAS_CFB32
-extern struct display_switch fbcon_sis32;
-#endif
-#endif
-
/* ------------------ Internal helper routines ----------------- */

static void __init
@@ -106,17 +77,7 @@ sisfb_setdefaultparms(void)
sisfb_max 		= -1;
sisfb_userom    	= -1;
sisfb_useoem    	= -1;
-#ifdef MODULE
-	/* Module: "None" for 2.4, default mode for 2.5+ */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-	sisfb_mode_idx 		= -1;
-#else
-	sisfb_mode_idx  	= MODE_INDEX_NONE;
-#endif
-#else
-	/* Static: Default mode */
sisfb_mode_idx  	= -1;
-#endif
sisfb_parm_rate 	= -1;
sisfb_crt1off 		= 0;
sisfb_forcecrt1 	= -1;
@@ -135,10 +96,6 @@ sisfb_setdefaultparms(void)
sisfb_tvyposoffset 	= 0;
sisfb_filter 		= -1;
sisfb_nocrt2rate 	= 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	sisfb_inverse   	= 0;
-	sisfb_fontname[0] 	= 0;
-#endif
#if !defined(__i386__) && !defined(__x86_64__)
sisfb_resetcard 	= 0;
sisfb_videoram  	= 0;
@@ -153,14 +110,10 @@ sisfb_search_vesamode(unsigned int vesam
/* BEWARE: We don't know the hardware specs yet and there is no ivideo */

if(vesamode == 0) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-		sisfb_mode_idx = MODE_INDEX_NONE;
-#else
if(!quiet) {
printk(KERN_ERR "sisfb: Invalid mode. Using default.n");
}
sisfb_mode_idx = DEFAULT_MODE;
-#endif
return;
}

@@ -203,7 +156,6 @@ sisfb_search_mode(char *name, BOOLEAN qu
return;
}

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
if(!strnicmp(name, sisbios_mode[MODE_INDEX_NONE].name, strlen(name))) {
if(!quiet) {
printk(KERN_ERR "sisfb: Mode 'none' not supported anymore. Using default.n");
@@ -211,7 +163,6 @@ sisfb_search_mode(char *name, BOOLEAN qu
sisfb_mode_idx = DEFAULT_MODE;
return;
}
-#endif
if(strlen(name) <= 19) {
strcpy(strbuf1, name);
for(i=0; i<strlen(strbuf1); i++) {
@@ -1129,20 +1080,7 @@ sisfb_do_set_var(struct fb_var_screeninf
ivideo->refresh_rate = 60;
}

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	if(ivideo->sisfb_thismonitor.datavalid) {
-	   if(!sisfb_verify_rate(ivideo, &ivideo->sisfb_thismonitor, ivideo->sisfb_mode_idx,
-	                         ivideo->rate_idx, ivideo->refresh_rate)) {
-	      printk(KERN_INFO "sisfb: WARNING: Refresh rate exceeds monitor specs!n");
-	   }
-	}
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	if(((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) && isactive) {
-#else
if(isactive) {
-#endif
sisfb_pre_setmode(ivideo);

if(SiSSetMode(&ivideo->SiS_Pr, &ivideo->sishw_ext, ivideo->mode_no) == 0) {
@@ -1185,9 +1123,7 @@ sisfb_do_set_var(struct fb_var_screeninf
ivideo->current_linelength = ivideo->video_linelength;
ivideo->current_pixclock = var->pixclock;
ivideo->current_refresh_rate = ivideo->refresh_rate;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
ivideo->sisfb_lastrates[ivideo->mode_no] = ivideo->refresh_rate;
-#endif
}

return 0;
@@ -1240,524 +1176,6 @@ sisfb_pan_var(struct sis_video_info *ivi
return 0;
}

-/* ------------ FBDev related routines for 2.4 series ----------- */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-static void
-sisfb_crtc_to_var(struct sis_video_info *ivideo, struct fb_var_screeninfo *var)
-{
-	u16 VRE, VBE, VRS, VBS, VDE, VT;
-	u16 HRE, HBE, HRS, HBS, HDE, HT;
-	u8  sr_data, cr_data, cr_data2, cr_data3, mr_data;
-	int A, B, C, D, E, F, temp;
-	unsigned int hrate, drate, maxyres;
-
-	inSISIDXREG(SISSR, IND_SIS_COLOR_MODE, sr_data);
-
-	if(sr_data & SIS_INTERLACED_MODE)
-	   var->vmode = FB_VMODE_INTERLACED;
-	else
-	   var->vmode = FB_VMODE_NONINTERLACED;
-
-	switch((sr_data & 0x1C) >> 2) {
-	case SIS_8BPP_COLOR_MODE:
-		var->bits_per_pixel = 8;
-		break;
-	case SIS_16BPP_COLOR_MODE:
-		var->bits_per_pixel = 16;
-		break;
-	case SIS_32BPP_COLOR_MODE:
-		var->bits_per_pixel = 32;
-		break;
-	}
-
-	sisfb_bpp_to_var(ivideo, var);
-
-	inSISIDXREG(SISSR, 0x0A, sr_data);
-        inSISIDXREG(SISCR, 0x06, cr_data);
-        inSISIDXREG(SISCR, 0x07, cr_data2);
-
-	VT = (cr_data & 0xFF) |
-	     ((u16) (cr_data2 & 0x01) << 8) |
-	     ((u16) (cr_data2 & 0x20) << 4) |
-	     ((u16) (sr_data  & 0x01) << 10);
-	A = VT + 2;
-
-	inSISIDXREG(SISCR, 0x12, cr_data);
-
-	VDE = (cr_data & 0xff) |
-	      ((u16) (cr_data2 & 0x02) << 7) |
-	      ((u16) (cr_data2 & 0x40) << 3) |
-	      ((u16) (sr_data  & 0x02) << 9);
-	E = VDE + 1;
-
-	inSISIDXREG(SISCR, 0x10, cr_data);
-
-	VRS = (cr_data & 0xff) |
-	      ((u16) (cr_data2 & 0x04) << 6) |
-	      ((u16) (cr_data2 & 0x80) << 2) |
-	      ((u16) (sr_data  & 0x08) << 7);
-	F = VRS + 1 - E;
-
-	inSISIDXREG(SISCR, 0x15, cr_data);
-	inSISIDXREG(SISCR, 0x09, cr_data3);
-
-	if(cr_data3 & 0x80) var->vmode = FB_VMODE_DOUBLE;
-
-	VBS = (cr_data & 0xff) |
-	      ((u16) (cr_data2 & 0x08) << 5) |
-	      ((u16) (cr_data3 & 0x20) << 4) |
-	      ((u16) (sr_data & 0x04) << 8);
-
-	inSISIDXREG(SISCR, 0x16, cr_data);
-
-	VBE = (cr_data & 0xff) | ((u16) (sr_data & 0x10) << 4);
-	temp = VBE - ((E - 1) & 511);
-	B = (temp > 0) ? temp : (temp + 512);
-
-	inSISIDXREG(SISCR, 0x11, cr_data);
-
-	VRE = (cr_data & 0x0f) | ((sr_data & 0x20) >> 1);
-	temp = VRE - ((E + F - 1) & 31);
-	C = (temp > 0) ? temp : (temp + 32);
-
-	D = B - F - C;
-
-        var->yres = E;
-	var->upper_margin = D;
-	var->lower_margin = F;
-	var->vsync_len = C;
-
-	if((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
-	   var->yres <<= 1;
-	   var->upper_margin <<= 1;
-	   var->lower_margin <<= 1;
-	   var->vsync_len <<= 1;
-	} else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
-	   var->yres >>= 1;
-	   var->upper_margin >>= 1;
-	   var->lower_margin >>= 1;
-	   var->vsync_len >>= 1;
-	}
-
-	inSISIDXREG(SISSR, 0x0b, sr_data);
-	inSISIDXREG(SISCR, 0x00, cr_data);
-
-	HT = (cr_data & 0xff) | ((u16) (sr_data & 0x03) << 8);
-	A = HT + 5;
-
-	inSISIDXREG(SISCR, 0x01, cr_data);
-
-	HDE = (cr_data & 0xff) | ((u16) (sr_data & 0x0C) << 6);
-	E = HDE + 1;
-
-	inSISIDXREG(SISCR, 0x04, cr_data);
-
-	HRS = (cr_data & 0xff) | ((u16) (sr_data & 0xC0) << 2);
-	F = HRS - E - 3;
-
-	inSISIDXREG(SISCR, 0x02, cr_data);
-
-	HBS = (cr_data & 0xff) | ((u16) (sr_data & 0x30) << 4);
-
-	inSISIDXREG(SISSR, 0x0c, sr_data);
-	inSISIDXREG(SISCR, 0x03, cr_data);
-	inSISIDXREG(SISCR, 0x05, cr_data2);
-
-	HBE = (cr_data & 0x1f) |
-	      ((u16) (cr_data2 & 0x80) >> 2) |
-	      ((u16) (sr_data  & 0x03) << 6);
-	HRE = (cr_data2 & 0x1f) | ((sr_data & 0x04) << 3);
-
-	temp = HBE - ((E - 1) & 255);
-	B = (temp > 0) ? temp : (temp + 256);
-
-	temp = HRE - ((E + F + 3) & 63);
-	C = (temp > 0) ? temp : (temp + 64);
-
-	D = B - F - C;
-
-	var->xres = E * 8;
-	if(var->xres_virtual < var->xres) {
-		var->xres_virtual = var->xres;
-	}
-
-	if((var->xres == 320) &&
-	   (var->yres == 200 || var->yres == 240)) {
-		/* Terrible hack, but the correct CRTC data for
-	  	 * these modes only produces a black screen...
-	  	 */
-       		var->left_margin = (400 - 376);
-       		var->right_margin = (328 - 320);
-       		var->hsync_len = (376 - 328);
-	} else {
-	   	var->left_margin = D * 8;
-	   	var->right_margin = F * 8;
-	   	var->hsync_len = C * 8;
-	}
-	var->activate = FB_ACTIVATE_NOW;
-
-	var->sync = 0;
-
-	mr_data = inSISREG(SISMISCR);
-	if(mr_data & 0x80)
-	   var->sync &= ~FB_SYNC_VERT_HIGH_ACT;
-	else
-	   var->sync |= FB_SYNC_VERT_HIGH_ACT;
-
-	if(mr_data & 0x40)
-	   var->sync &= ~FB_SYNC_HOR_HIGH_ACT;
-	else
-	   var->sync |= FB_SYNC_HOR_HIGH_ACT;
-
-	VT += 2;
-	VT <<= 1;
-	HT = (HT + 5) * 8;
-
-	if((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
-	   VT <<= 1;
-	}
-	hrate = ivideo->refresh_rate * VT / 2;
-	drate = (hrate * HT) / 1000;
-	var->pixclock = (u32) (1000000000 / drate);
-
-	if(ivideo->sisfb_ypan) {
-	   maxyres = sisfb_calc_maxyres(ivideo, var);
-	   if(ivideo->sisfb_max) {
-	      var->yres_virtual = maxyres;
-	   } else {
-	      if(var->yres_virtual > maxyres) {
-	         var->yres_virtual = maxyres;
-	      }
-	   }
-	   if(var->yres_virtual <= var->yres) {
-	      var->yres_virtual = var->yres;
-	   }
-	} else {
-	   var->yres_virtual = var->yres;
-	}
-
-}
-
-static int
-sis_getcolreg(unsigned regno, unsigned *red, unsigned *green, unsigned *blue,
-			 unsigned *transp, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-
-	if(regno >= ivideo->video_cmap_len) return 1;
-
-	*red   = ivideo->sis_palette[regno].red;
-	*green = ivideo->sis_palette[regno].green;
-	*blue  = ivideo->sis_palette[regno].blue;
-	*transp = 0;
-
-	return 0;
-}
-
-static int
-sisfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
-                           unsigned transp, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-
-	if(regno >= ivideo->video_cmap_len) return 1;
-
-	ivideo->sis_palette[regno].red   = red;
-	ivideo->sis_palette[regno].green = green;
-	ivideo->sis_palette[regno].blue  = blue;
-
-	switch(ivideo->video_bpp) {
-#ifdef FBCON_HAS_CFB8
-	case 8:
-	        outSISREG(SISDACA, regno);
-		outSISREG(SISDACD, (red >> 10));
-		outSISREG(SISDACD, (green >> 10));
-		outSISREG(SISDACD, (blue >> 10));
-		if(ivideo->currentvbflags & VB_DISPTYPE_DISP2) {
-		        outSISREG(SISDAC2A, regno);
-			outSISREG(SISDAC2D, (red >> 8));
-			outSISREG(SISDAC2D, (green >> 8));
-			outSISREG(SISDAC2D, (blue >> 8));
-		}
-		break;
-#endif
-#ifdef FBCON_HAS_CFB16
-	case 16:
-		ivideo->sis_fbcon_cmap.cfb16[regno] =
-		    ((red & 0xf800)) | ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11);
-		break;
-#endif
-#ifdef FBCON_HAS_CFB32
-	case 32:
-		red   >>= 8;
-		green >>= 8;
-		blue  >>= 8;
-		ivideo->sis_fbcon_cmap.cfb32[regno] = (red << 16) | (green << 8) | (blue);
-		break;
-#endif
-	}
-
-	return 0;
-}
-
-static void
-sisfb_set_disp(int con, struct fb_var_screeninfo *var, struct fb_info *info)
-{
-	struct sis_video_info    *ivideo = (struct sis_video_info *)info->par;
-	struct display           *display;
-	struct display_switch    *sw;
-	struct fb_fix_screeninfo fix;
-	long   flags;
-
-	display = (con >= 0) ? &fb_display[con] : &ivideo->sis_disp;
-
-	sisfb_get_fix(&fix, con, info);
-
-	display->var = *var;
-	display->screen_base = (char *)ivideo->video_vbase;
-	display->visual = fix.visual;
-	display->type = fix.type;
-	display->type_aux = fix.type_aux;
-	display->ypanstep = fix.ypanstep;
-	display->ywrapstep = fix.ywrapstep;
-	display->line_length = fix.line_length;
-	display->can_soft_blank = 1;
-	display->inverse = ivideo->sisfb_inverse;
-	display->next_line = fix.line_length;
-
-	save_flags(flags);
-
-	switch(ivideo->video_bpp) {
-#ifdef FBCON_HAS_CFB8
-	case 8:	sw = ivideo->accel ? &fbcon_sis8 : &fbcon_cfb8;
-		break;
-#endif
-#ifdef FBCON_HAS_CFB16
-	case 16:sw = ivideo->accel ? &fbcon_sis16 : &fbcon_cfb16;
-		display->dispsw_data = &ivideo->sis_fbcon_cmap.cfb16;
-		break;
-#endif
-#ifdef FBCON_HAS_CFB32
-	case 32:sw = ivideo->accel ? &fbcon_sis32 : &fbcon_cfb32;
-		display->dispsw_data = &ivideo->sis_fbcon_cmap.cfb32;
-		break;
-#endif
-	default:sw = &fbcon_dummy;
-		break;
-	}
-	memcpy(&ivideo->sisfb_sw, sw, sizeof(*sw));
-	display->dispsw = &ivideo->sisfb_sw;
-
-	restore_flags(flags);
-
-        if(ivideo->sisfb_ypan) {
-  	    /* display->scrollmode = 0;  */
-	} else {
-	    display->scrollmode = SCROLL_YREDRAW;
-	    ivideo->sisfb_sw.bmove = fbcon_redraw_bmove;
-	}
-}
-
-static void
-sisfb_do_install_cmap(int con, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-
-        if(con != ivideo->currcon) return;
-
-        if(fb_display[con].cmap.len) {
-		fb_set_cmap(&fb_display[con].cmap, 1, sisfb_setcolreg, info);
-        } else {
-		int size = sisfb_get_cmap_len(&fb_display[con].var);
-		fb_set_cmap(fb_default_cmap(size), 1, sisfb_setcolreg, info);
-	}
-}
-
-static int
-sisfb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-
-	if(con == -1) {
-		memcpy(var, &ivideo->default_var, sizeof(struct fb_var_screeninfo));
-	} else {
-		*var = fb_display[con].var;
-	}
-
-	if(ivideo->sisfb_fstn) {
-	   	if(var->xres == 320 && var->yres == 480) var->yres = 240;
-        }
-
-	return 0;
-}
-
-static int
-sisfb_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-	int err;
-
-	fb_display[con].var.activate = FB_ACTIVATE_NOW;
-
-        if(sisfb_do_set_var(var, con == ivideo->currcon, info)) {
-		sisfb_crtc_to_var(ivideo, var);
-		return -EINVAL;
-	}
-
-	sisfb_crtc_to_var(ivideo, var);
-
-	sisfb_set_disp(con, var, info);
-
-	if(info->changevar) {
-		(*info->changevar)(con);
-	}
-
-	if((err = fb_alloc_cmap(&fb_display[con].cmap, 0, 0))) {
-		return err;
-	}
-
-	sisfb_do_install_cmap(con, info);
-
-#if 0	/* Why was this called here? */
-	unsigned int cols, rows;
-	cols = sisbios_mode[ivideo->sisfb_mode_idx].cols;
-	rows = sisbios_mode[ivideo->sisfb_mode_idx].rows;
- 	vc_resize_con(rows, cols, fb_display[con].conp->vc_num);
-#endif
-	return 0;
-}
-
-static int
-sisfb_get_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-	struct display *display;
-
-	display = (con >= 0) ? &fb_display[con] : &ivideo->sis_disp;
-
-        if(con == ivideo->currcon) {
-
-		return fb_get_cmap(cmap, kspc, sis_getcolreg, info);
-
-	} else if(display->cmap.len) {
-
-		fb_copy_cmap(&display->cmap, cmap, kspc ? 0 : 2);
-
-	} else {
-
-		int size = sisfb_get_cmap_len(&display->var);
-		fb_copy_cmap(fb_default_cmap(size), cmap, kspc ? 0 : 2);
-
-	}
-
-	return 0;
-}
-
-static int
-sisfb_set_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-	struct display *display;
-	int err, size;
-
-	display = (con >= 0) ? &fb_display[con] : &ivideo->sis_disp;
-
-	size = sisfb_get_cmap_len(&display->var);
-	if(display->cmap.len != size) {
-		err = fb_alloc_cmap(&display->cmap, size, 0);
-		if(err)	return err;
-	}
-
-	if(con == ivideo->currcon) {
-		return fb_set_cmap(cmap, kspc, sisfb_setcolreg, info);
-	} else {
-		fb_copy_cmap(cmap, &display->cmap, kspc ? 0 : 1);
-	}
-
-	return 0;
-}
-
-static int
-sisfb_pan_display(struct fb_var_screeninfo *var, int con, struct fb_info* info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-	int err;
-
-	if(var->vmode & FB_VMODE_YWRAP) return -EINVAL;
-
-	if((var->xoffset+fb_display[con].var.xres > fb_display[con].var.xres_virtual) ||
-	   (var->yoffset+fb_display[con].var.yres > fb_display[con].var.yres_virtual)) {
-		return -EINVAL;
-	}
-
-        if(con == ivideo->currcon) {
-	   	if((err = sisfb_pan_var(ivideo, var)) < 0) return err;
-	}
-
-	fb_display[con].var.xoffset = var->xoffset;
-	fb_display[con].var.yoffset = var->yoffset;
-
-	return 0;
-}
-
-static int
-sisfb_update_var(int con, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-
-        return(sisfb_pan_var(ivideo, &fb_display[con].var));
-}
-
-static int
-sisfb_switch(int con, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-	int cols, rows;
-
-        if(fb_display[ivideo->currcon].cmap.len) {
-		fb_get_cmap(&fb_display[ivideo->currcon].cmap, 1, sis_getcolreg, info);
-	}
-
-	fb_display[con].var.activate = FB_ACTIVATE_NOW;
-
-	if(!memcmp(&fb_display[con].var, &fb_display[ivideo->currcon].var,
-	                           	sizeof(struct fb_var_screeninfo))) {
-		ivideo->currcon = con;
-		return 1;
-	}
-
-	ivideo->currcon = con;
-
-	sisfb_do_set_var(&fb_display[con].var, 1, info);
-
-	sisfb_set_disp(con, &fb_display[con].var, info);
-
-	sisfb_do_install_cmap(con, info);
-
-	cols = sisbios_mode[ivideo->sisfb_mode_idx].cols;
-	rows = sisbios_mode[ivideo->sisfb_mode_idx].rows;
-	vc_resize_con(rows, cols, fb_display[con].conp->vc_num);
-
-	sisfb_update_var(con, info);
-
-	return 1;
-}
-
-static void
-sisfb_blank(int blank, struct fb_info *info)
-{
-	struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
-
-	sisfb_myblank(ivideo, blank);
-}
-#endif
-
-/* ------------ FBDev related routines for 2.6 series ----------- */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-
static int
sisfb_open(struct fb_info *info, int user)
{
@@ -1814,11 +1232,7 @@ sisfb_set_par(struct fb_info *info)
if((err = sisfb_do_set_var(&info->var, 1, info))) {
return err;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-	sisfb_get_fix(&info->fix, info->currcon, info);
-#else
sisfb_get_fix(&info->fix, -1, info);
-#endif
return 0;
}

@@ -2043,16 +1457,11 @@ sisfb_blank(int blank, struct fb_info *i
return(sisfb_myblank(ivideo, blank));
}

-#endif
-
/* ----------- FBDev related routines for all series ---------- */

static int
sisfb_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	    int con,
-#endif
struct fb_info *info)
{
struct sis_video_info	*ivideo = (struct sis_video_info *)info->par;
@@ -2060,9 +1469,6 @@ sisfb_ioctl(struct inode *inode, struct
struct fb_vblank  	sisvbblank;
sisfb_info        	x;
u32			gpu32 = 0;
-#ifndef __user
-#define __user
-#endif
u32 __user 		*argp = (u32 __user *)arg;

switch (cmd) {
@@ -2243,20 +1649,6 @@ sisfb_get_fix(struct fb_fix_screeninfo *

/* ----------------  fb_ops structures ----------------- */

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static struct fb_ops sisfb_ops = {
-	.owner		= THIS_MODULE,
-	.fb_get_fix	= sisfb_get_fix,
-	.fb_get_var	= sisfb_get_var,
-	.fb_set_var	= sisfb_set_var,
-	.fb_get_cmap	= sisfb_get_cmap,
-	.fb_set_cmap	= sisfb_set_cmap,
-        .fb_pan_display = sisfb_pan_display,
-	.fb_ioctl	= sisfb_ioctl
-};
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static struct fb_ops sisfb_ops = {
.owner          = THIS_MODULE,
.fb_open        = sisfb_open,
@@ -2276,7 +1668,6 @@ static struct fb_ops sisfb_ops = {
.fb_compat_ioctl = sisfb_compat_ioctl,
#endif
};
-#endif

/* ---------------- Chip generation dependent routines ---------------- */

@@ -3887,16 +3278,6 @@ SISINITSTATIC int __init sisfb_setup(cha
sisfb_search_mode(this_opt + 5, FALSE);
} else if(!strnicmp(this_opt, "vesa:", 5)) {
sisfb_search_vesamode(simple_strtoul(this_opt + 5, NULL, 0), FALSE);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-		} else if(!strnicmp(this_opt, "inverse", 7)) {
-			sisfb_inverse = 1;
-			/* fb_invert_cmaps(); */
-		} else if(!strnicmp(this_opt, "font:", 5)) {
-		        if(strlen(this_opt + 5) < 40) {
-			   strncpy(sisfb_fontname, this_opt + 5, sizeof(sisfb_fontname) - 1);
-			   sisfb_fontname[sizeof(sisfb_fontname) - 1] = '0';
-			}
-#endif
} else if(!strnicmp(this_opt, "rate:", 5)) {
sisfb_parm_rate = simple_strtoul(this_opt + 5, NULL, 0);
} else if(!strnicmp(this_opt, "filter:", 7)) {
@@ -4744,7 +4125,7 @@ static void __devinit sisfb_post_sis3153
iounmap(ivideo->video_vbase);
} else {
printk(KERN_DEBUG "sisfb: Failed to map memory for size detection, assuming 8MBn");
-	   outSISIDXREG(SISSR,0x14,0x??);  /* 8MB, 64bit default */
+	   outSISIDXREG(SISSR,0x14,0x00);  /* 8MB, 64bit default */
}

/* AGP (Missing: Checks for VIA and AMD hosts) */
@@ -4774,15 +4155,8 @@ static int __devinit sisfb_probe(struct

if(sisfb_off) return -ENXIO;

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3))
sis_fb_info = framebuffer_alloc(sizeof(*ivideo), &pdev->dev);
if(!sis_fb_info) return -ENOMEM;
-#else
-	sis_fb_info = kmalloc(sizeof(*sis_fb_info) + sizeof(*ivideo), GFP_KERNEL);
-	if(!sis_fb_info) return -ENOMEM;
-	memset(sis_fb_info, 0, sizeof(*sis_fb_info) + sizeof(*ivideo));
-	sis_fb_info->par = ((char *)sis_fb_info + sizeof(*sis_fb_info));
-#endif

ivideo = (struct sis_video_info *)sis_fb_info->par;
ivideo->memyselfandi = sis_fb_info;
@@ -4848,9 +4222,6 @@ static int __devinit sisfb_probe(struct
ivideo->tvypos = sisfb_tvyposoffset;
ivideo->sisfb_filter = sisfb_filter;
ivideo->sisfb_nocrt2rate = sisfb_nocrt2rate;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
-	ivideo->sisfb_inverse = sisfb_inverse;
-#endif

ivideo->refresh_rate = 0;
if(ivideo->sisfb_parm_rate != -1) {
@@ -4920,10 +4291,6 @@ static int __devinit sisfb_probe(struct
}
}

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	strcpy(sis_fb_info->modename, ivideo->myid);
-#endif
-
ivideo->sishw_ext.jChipType = ivideo->chip;

#ifdef CONFIG_FB_SIS_315
@@ -4993,19 +4360,6 @@ static int __devinit sisfb_probe(struct
#endif
}

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#ifdef MODULE
-	if((reg & 0x80) && (reg != 0xff)) {
-	   if((sisbios_mode[ivideo->sisfb_mode_idx].mode_no[ivideo->mni]) != 0xFF) {
-	      printk(KERN_INFO "sisfb: Cannot initialize display mode, X server is activen");
-	      pci_set_drvdata(pdev, NULL);
-	      kfree(sis_fb_info);
-	      return -EBUSY;
-	   }
-	}
-#endif
-#endif
-
ivideo->sishw_ext.bIntegratedMMEnabled = TRUE;
#ifdef CONFIG_FB_SIS_300
if(ivideo->sisvga_engine == SIS_300_VGA) {
@@ -5455,65 +4809,6 @@ static int __devinit sisfb_probe(struct

sisfb_set_vparms(ivideo);

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-		/* ---------------- For 2.4: Now switch the mode ------------------ */
-
-		printk(KERN_INFO "sisfb: Mode is %dx%dx%d (%dHz)n",
-	       		ivideo->video_width, ivideo->video_height, ivideo->video_bpp,
-			ivideo->refresh_rate);
-
-		sisfb_pre_setmode(ivideo);
-
-		if(SiSSetMode(&ivideo->SiS_Pr, &ivideo->sishw_ext, ivideo->mode_no) == 0) {
-			printk(KERN_ERR "sisfb: Fatal error: Setting mode[0x%x] failedn",
-									ivideo->mode_no);
-			iounmap(ivideo->video_vbase);
-			iounmap(ivideo->mmio_vbase);
-			release_mem_region(ivideo->video_base, ivideo->video_size);
-			release_mem_region(ivideo->mmio_base, ivideo->mmio_size);
-			if(ivideo->bios_abase) vfree(ivideo->bios_abase);
-			pci_set_drvdata(pdev, NULL);
-			kfree(sis_fb_info);
-			return -EINVAL;
-		}
-
-		outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD);
-
-		sisfb_post_setmode(ivideo);
-
-		/* Maximize regardless of sisfb_max at startup */
-		ivideo->default_var.yres_virtual = 32767;
-
-		/* Force reset of x virtual in crtc_to_var */
-		ivideo->default_var.xres_virtual = 0;
-
-		sisfb_crtc_to_var(ivideo, &ivideo->default_var);
-
-		sisfb_calc_pitch(ivideo, &ivideo->default_var);
-		sisfb_set_pitch(ivideo);
-
-		ivideo->accel = 0;
-		if(ivideo->sisfb_accel) {
-		   ivideo->accel = -1;
-		   ivideo->default_var.accel_flags |= FB_ACCELF_TEXT;
-		}
-		sisfb_initaccel(ivideo);
-
-		sis_fb_info->node  = -1;
-		sis_fb_info->flags = FBINFO_FLAG_DEFAULT;
-		sis_fb_info->fbops = &sisfb_ops;
-		sis_fb_info->disp  = &ivideo->sis_disp;
-		sis_fb_info->blank = &sisfb_blank;
-		sis_fb_info->switch_con = &sisfb_switch;
-		sis_fb_info->updatevar  = &sisfb_update_var;
-		sis_fb_info->changevar  = NULL;
-		strcpy(sis_fb_info->fontname, sisfb_fontname);
-
-		sisfb_set_disp(-1, &ivideo->default_var, sis_fb_info);
-
-#else		/* --------- For 2.6: Setup a somewhat sane default var ------------ */
-
printk(KERN_INFO "sisfb: Default mode is %dx%dx%d (%dHz)n",
ivideo->video_width, ivideo->video_height, ivideo->video_bpp,
ivideo->refresh_rate);
@@ -5573,7 +4868,6 @@ static int __devinit sisfb_probe(struct
sis_fb_info->pseudo_palette = ivideo->pseudo_palette;

fb_alloc_cmap(&sis_fb_info->cmap, 256 , 0);
-#endif		/* 2.6 */

printk(KERN_DEBUG "sisfb: Initial vbflags 0x%lxn", (unsigned long)ivideo->vbflags);

@@ -5585,10 +4879,6 @@ static int __devinit sisfb_probe(struct
}
#endif

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-		vc_resize_con(1, 1, 0);
-#endif
-
if(register_framebuffer(sis_fb_info) < 0) {
printk(KERN_ERR "sisfb: Fatal error: Failed to register framebuffern");
iounmap(ivideo->video_vbase);
@@ -5614,11 +4904,7 @@ static int __devinit sisfb_probe(struct


printk(KERN_INFO "fb%d: %s frame buffer device, Version %d.%d.%dn",
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	       		GET_FB_IDX(sis_fb_info->node),
-#else
sis_fb_info->node,
-#endif
ivideo->myid, VER_MAJOR, VER_MINOR, VER_LEVEL);

printk(KERN_INFO "sisfb: (C) 2001-2004 Thomas Winischhofer.n");
@@ -5657,11 +4943,7 @@ static void __devexit sisfb_remove(struc
/* Unregister the framebuffer */
if(ivideo->registered) {
unregister_framebuffer(sis_fb_info);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3))
framebuffer_release(sis_fb_info);
-#else
-		kfree(sis_fb_info);
-#endif
}

pci_set_drvdata(pdev, NULL);
@@ -5687,7 +4969,6 @@ static struct pci_driver sisfb_driver =

SISINITSTATIC int __init sisfb_init(void)
{
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
#ifndef MODULE
char *options = NULL;

@@ -5695,15 +4976,12 @@ SISINITSTATIC int __init sisfb_init(void
return -ENODEV;
sisfb_setup(options);
#endif
-#endif
return(pci_register_driver(&sisfb_driver));
}

-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
#ifndef MODULE
module_init(sisfb_init);
#endif
-#endif

/*****************************************************/
/*                      MODULE                       */
@@ -5723,9 +5001,6 @@ static int          pdc1 = -1;
static int          noaccel = -1;
static int          noypan  = -1;
static int	    nomax = -1;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static int          inverse = 0;
-#endif
static int          userom = -1;
static int          useoem = -1;
static char         *tvstandard = NULL;
@@ -5744,36 +5019,7 @@ MODULE_DESCRIPTION("SiS 300/540/630/730/
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Thomas Winischhofer <thomas@winischhofer.net>, Others");

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM(mem, "i");
-MODULE_PARM(noaccel, "i");
-MODULE_PARM(noypan, "i");
-MODULE_PARM(nomax, "i");
-MODULE_PARM(userom, "i");
-MODULE_PARM(useoem, "i");
-MODULE_PARM(mode, "s");
-MODULE_PARM(vesa, "i");
-MODULE_PARM(rate, "i");
-MODULE_PARM(forcecrt1, "i");
-MODULE_PARM(forcecrt2type, "s");
-MODULE_PARM(scalelcd, "i");
-MODULE_PARM(pdc, "i");
-MODULE_PARM(pdc1, "i");
-MODULE_PARM(specialtiming, "s");
-MODULE_PARM(lvdshl, "i");
-MODULE_PARM(tvstandard, "s");
-MODULE_PARM(tvxposoffset, "i");
-MODULE_PARM(tvyposoffset, "i");
-MODULE_PARM(filter, "i");
-MODULE_PARM(nocrt2rate, "i");
-MODULE_PARM(inverse, "i");
-#if !defined(__i386__) && !defined(__x86_64__)
-MODULE_PARM(resetcard, "i");
-MODULE_PARM(videoram, "i");
-#endif
-#endif

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
module_param(mem, int, 0);
module_param(noaccel, int, 0);
module_param(noypan, int, 0);
@@ -5799,7 +5045,6 @@ module_param(nocrt2rate, int, 0);
module_param(resetcard, int, 0);
module_param(videoram, int, 0);
#endif
-#endif

MODULE_PARM_DESC(mem,
"nDetermines the beginning of the video memory heap in KB. This heap is usedn"
@@ -5825,23 +5070,7 @@ MODULE_PARM_DESC(nomax,
"enable the user to positively specify a virtual Y size of the screen usingn"
"fbset. (default: 0)n");

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM_DESC(mode,
-        "nSelects the desired display mode in the format [X]x[Y]x[Depth], eg.n"
-          "1024x768x16. Other formats supported include XxY-Depth andn"
- 	  "XxY-Depth@Rate. If the parameter is only one (decimal or hexadecimal)n"
-	  "number, it will be interpreted as a VESA mode number. (default: none ifn"
-	  "sisfb is a module; this leaves the console untouched and the driver willn"
-	  "only do the video memory management for eg. DRM/DRI; 800x600x8 if sisfbn"
-	  "is in the kernel)n");
-MODULE_PARM_DESC(vesa,
-        "nSelects the desired display mode by VESA defined mode number, eg. 0x117n"
-          "(default: 0x0000 if sisfb is a module; this leaves the console untouchedn"
-	  "and the driver will only do the video memory management for eg. DRM/DRI;n"
-	  "0x0103 if sisfb is in the kernel)n");
-#endif

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
MODULE_PARM_DESC(mode,
"nSelects the desired default display mode in the format XxYxDepth,n"
"eg. 1024x768x16. Other formats supported include XxY-Depth andn"
@@ -5851,7 +5080,6 @@ MODULE_PARM_DESC(mode,
MODULE_PARM_DESC(vesa,
"nSelects the desired default display mode by VESA defined mode number, eg.n"
"0x117 (default: 0x0103)n");
-#endif

MODULE_PARM_DESC(rate,
"nSelects the desired vertical refresh rate for CRT1 (external VGA) in Hz.n"
@@ -5921,12 +5149,6 @@ MODULE_PARM_DESC(nocrt2rate,
"nSetting this to 1 will force the driver to use the default refresh rate forn"
"CRT2 if CRT2 type is VGA. (default: 0, use same rate as CRT1)n");

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM_DESC(inverse,
-        "nSetting this to anything but 0 should invert the display colors, but thisn"
-	  "does not seem to work. (default: 0)n");
-#endif
-
#if !defined(__i386__) && !defined(__x86_64__)
#ifdef CONFIG_FB_SIS_300
MODULE_PARM_DESC(resetcard,
@@ -5979,10 +5201,6 @@ static int __devinit sisfb_init_module(v
if(nomax == 1)        sisfb_max = 0;
else if(nomax == 0)   sisfb_max = 1;

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	if(inverse)           sisfb_inverse = 1;
-#endif
-
if(mem)		      sisfb_parm_mem = mem;

if(userom != -1)      sisfb_userom = userom;
Index: linux-2.6.13-rc2-mm1/drivers/video/sis/sis_main.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/sis/sis_main.h
+++ linux-2.6.13-rc2-mm1/drivers/video/sis/sis_main.h
@@ -68,15 +68,7 @@ static int sisfb_ypan = -1;
static int sisfb_max = -1;
static int sisfb_userom = 1;
static int sisfb_useoem = -1;
-#ifdef MODULE
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-static int sisfb_mode_idx = -1;
-#else
-static int sisfb_mode_idx = MODE_INDEX_NONE;  /* Don't use a mode by default if we are a module */
-#endif
-#else
static int sisfb_mode_idx = -1;               /* Use a default mode if we are inside the kernel */
-#endif
static int sisfb_parm_rate = -1;
static int sisfb_crt1off = 0;
static int sisfb_forcecrt1 = -1;
@@ -95,10 +87,6 @@ static int sisfb_tvxposoffset = 0;
static int sisfb_tvyposoffset = 0;
static int sisfb_filter = -1;
static int sisfb_nocrt2rate = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static int  sisfb_inverse = 0;
-static char sisfb_fontname[40];
-#endif
#if !defined(__i386__) && !defined(__x86_64__)
static int sisfb_resetcard = 0;
static int sisfb_videoram = 0;
@@ -816,46 +804,6 @@ SISINITSTATIC int sisfb_init(void);
static int      sisfb_get_fix(struct fb_fix_screeninfo *fix, int con,
struct fb_info *info);

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static int      sisfb_get_fix(struct fb_fix_screeninfo *fix,
-			      int con,
-			      struct fb_info *info);
-static int      sisfb_get_var(struct fb_var_screeninfo *var,
-			      int con,
-			      struct fb_info *info);
-static int      sisfb_set_var(struct fb_var_screeninfo *var,
-			      int con,
-			      struct fb_info *info);
-static void     sisfb_crtc_to_var(struct sis_video_info *ivideo,
-			          struct fb_var_screeninfo *var);
-static int      sisfb_get_cmap(struct fb_cmap *cmap,
-			       int kspc,
-			       int con,
-			       struct fb_info *info);
-static int      sisfb_set_cmap(struct fb_cmap *cmap,
-			       int kspc,
-			       int con,
-			       struct fb_info *info);
-static int      sisfb_update_var(int con,
-				 struct fb_info *info);
-static int      sisfb_switch(int con,
-			     struct fb_info *info);
-static void     sisfb_blank(int blank,
-			    struct fb_info *info);
-static void     sisfb_set_disp(int con,
-			       struct fb_var_screeninfo *var,
-                               struct fb_info *info);
-static int      sis_getcolreg(unsigned regno, unsigned *red, unsigned *green,
-			      unsigned *blue, unsigned *transp,
-			      struct fb_info *fb_info);
-static void     sisfb_do_install_cmap(int con,
-                                      struct fb_info *info);
-static int      sisfb_ioctl(struct inode *inode, struct file *file,
-		       	    unsigned int cmd, unsigned long arg, int con,
-		       	    struct fb_info *info);
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static int      sisfb_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg,
struct fb_info *info);
@@ -867,7 +815,6 @@ extern void     fbcon_sis_fillrect(struc
extern void     fbcon_sis_copyarea(struct fb_info *info,
const struct fb_copyarea *area);
extern int      fbcon_sis_sync(struct fb_info *info);
-#endif

/* Internal 2D accelerator functions */
extern int      sisfb_initaccel(struct sis_video_info *ivideo);
@@ -926,14 +873,12 @@ extern BOOLEAN  SiSDetermineROMLayout661

extern BOOLEAN  sisfb_gettotalfrommode(SiS_Private *SiS_Pr, PSIS_HW_INFO HwDeviceExtension,
unsigned char modeno, int *htotal, int *vtotal, unsigned char rateindex);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
extern int	sisfb_mode_rate_to_dclock(SiS_Private *SiS_Pr,
PSIS_HW_INFO HwDeviceExtension,
unsigned char modeno, unsigned char rateindex);
extern int      sisfb_mode_rate_to_ddata(SiS_Private *SiS_Pr, PSIS_HW_INFO HwDeviceExtension,
unsigned char modeno, unsigned char rateindex,
struct fb_var_screeninfo *var);
-#endif

/* Chrontel TV, DDC and DPMS functions */
extern USHORT 	SiS_GetCH700x(SiS_Private *SiS_Pr, USHORT tempbx);
Index: linux-2.6.13-rc2-mm1/drivers/video/sis/vgatypes.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/sis/vgatypes.h
+++ linux-2.6.13-rc2-mm1/drivers/video/sis/vgatypes.h
@@ -55,7 +55,6 @@

#ifdef LINUX_KERNEL  /* We don't want the X driver to depend on kernel source */
#include <linux/ioctl.h>
-#include <linux/version.h>
#endif

#ifndef FALSE
@@ -102,12 +101,10 @@ typedef unsigned char BOOLEAN;

#ifdef LINUX_KERNEL
typedef unsigned long SISIOADDRESS;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
#include <linux/types.h>  /* Need __iomem */
#undef SISIOMEMTYPE
#define SISIOMEMTYPE __iomem
#endif
-#endif

#ifdef LINUX_XF86
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)

[PATCH 63/82] remove linux/version.h from fs/9p

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

fs/9p/vfs_file.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/fs/9p/vfs_file.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/9p/vfs_file.c
+++ linux-2.6.13-rc2-mm1/fs/9p/vfs_file.c
@@ -32,7 +32,6 @@
#include <linux/string.h>
#include <linux/smp_lock.h>
#include <linux/inet.h>
-#include <linux/version.h>
#include <linux/list.h>
#include <asm/uaccess.h>

[PATCH 64/82] remove linux/version.h from fs/adfs/adfs.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

fs/adfs/adfs.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/fs/adfs/adfs.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/adfs/adfs.h
+++ linux-2.6.13-rc2-mm1/fs/adfs/adfs.h
@@ -12,7 +12,6 @@
#define ADFS_NDA_PUBLIC_READ	(1 << 5)
#define ADFS_NDA_PUBLIC_WRITE	(1 << 6)

-#include <linux/version.h>
#include "dir_f.h"

struct buffer_head;

[PATCH 65/82] remove linux/version.h from fs/configfs

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

fs/configfs/symlink.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/fs/configfs/symlink.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/configfs/symlink.c
+++ linux-2.6.13-rc2-mm1/fs/configfs/symlink.c
@@ -24,7 +24,6 @@
* configfs Copyright (C) 2005 Oracle.  All rights reserved.
*/

-#include <linux/version.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/namei.h>

[PATCH 66/82] remove linux/version.h from fs/hfs/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

fs/hfs/hfs_fs.h |    1 -
fs/hfs/inode.c  |    1 -
2 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/fs/hfs/hfs_fs.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfs/hfs_fs.h
+++ linux-2.6.13-rc2-mm1/fs/hfs/hfs_fs.h
@@ -9,7 +9,6 @@
#ifndef _LINUX_HFS_FS_H
#define _LINUX_HFS_FS_H

-#include <linux/version.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/buffer_head.h>
Index: linux-2.6.13-rc2-mm1/fs/hfs/inode.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfs/inode.c
+++ linux-2.6.13-rc2-mm1/fs/hfs/inode.c
@@ -12,7 +12,6 @@
*/

#include <linux/pagemap.h>
-#include <linux/version.h>
#include <linux/mpage.h>

#include "hfs_fs.h"

[PATCH 67/82] remove linux/version.h from fs/hfsplus/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

fs/hfsplus/bnode.c      |    1 -
fs/hfsplus/dir.c        |    1 -
fs/hfsplus/extents.c    |    1 -
fs/hfsplus/hfsplus_fs.h |    1 -
fs/hfsplus/inode.c      |    1 -
fs/hfsplus/super.c      |    1 -
fs/hfsplus/wrapper.c    |    1 -
7 files changed, 7 deletions(-)

Index: linux-2.6.13-rc2-mm1/fs/hfsplus/bnode.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfsplus/bnode.c
+++ linux-2.6.13-rc2-mm1/fs/hfsplus/bnode.c
@@ -13,7 +13,6 @@
#include <linux/pagemap.h>
#include <linux/fs.h>
#include <linux/swap.h>
-#include <linux/version.h>

#include "hfsplus_fs.h"
#include "hfsplus_raw.h"
Index: linux-2.6.13-rc2-mm1/fs/hfsplus/dir.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfsplus/dir.c
+++ linux-2.6.13-rc2-mm1/fs/hfsplus/dir.c
@@ -13,7 +13,6 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/random.h>
-#include <linux/version.h>

#include "hfsplus_fs.h"
#include "hfsplus_raw.h"
Index: linux-2.6.13-rc2-mm1/fs/hfsplus/extents.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfsplus/extents.c
+++ linux-2.6.13-rc2-mm1/fs/hfsplus/extents.c
@@ -11,7 +11,6 @@
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/pagemap.h>
-#include <linux/version.h>

#include "hfsplus_fs.h"
#include "hfsplus_raw.h"
Index: linux-2.6.13-rc2-mm1/fs/hfsplus/hfsplus_fs.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfsplus/hfsplus_fs.h
+++ linux-2.6.13-rc2-mm1/fs/hfsplus/hfsplus_fs.h
@@ -11,7 +11,6 @@
#define _LINUX_HFSPLUS_FS_H

#include <linux/fs.h>
-#include <linux/version.h>
#include <linux/buffer_head.h>
#include "hfsplus_raw.h"

Index: linux-2.6.13-rc2-mm1/fs/hfsplus/inode.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfsplus/inode.c
+++ linux-2.6.13-rc2-mm1/fs/hfsplus/inode.c
@@ -11,7 +11,6 @@
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/pagemap.h>
-#include <linux/version.h>
#include <linux/mpage.h>

#include "hfsplus_fs.h"
Index: linux-2.6.13-rc2-mm1/fs/hfsplus/super.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfsplus/super.c
+++ linux-2.6.13-rc2-mm1/fs/hfsplus/super.c
@@ -14,7 +14,6 @@
#include <linux/fs.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <linux/version.h>
#include <linux/vfs.h>
#include <linux/nls.h>

Index: linux-2.6.13-rc2-mm1/fs/hfsplus/wrapper.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hfsplus/wrapper.c
+++ linux-2.6.13-rc2-mm1/fs/hfsplus/wrapper.c
@@ -12,7 +12,6 @@
#include <linux/blkdev.h>
#include <linux/cdrom.h>
#include <linux/genhd.h>
-#include <linux/version.h>
#include <asm/unaligned.h>

#include "hfsplus_fs.h"

[PATCH 68/82] remove linux/version.h from fs/hostfs/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

fs/hostfs/hostfs_kern.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/fs/hostfs/hostfs_kern.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/hostfs/hostfs_kern.c
+++ linux-2.6.13-rc2-mm1/fs/hostfs/hostfs_kern.c
@@ -8,7 +8,6 @@

#include <linux/stddef.h>
#include <linux/fs.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>

[PATCH 69/82] remove linux/version.h from fs/ocfs2/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

fs/ocfs2/dlmglue.c |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/fs/ocfs2/dlmglue.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/ocfs2/dlmglue.c
+++ linux-2.6.13-rc2-mm1/fs/ocfs2/dlmglue.c
@@ -23,7 +23,6 @@
* Boston, MA 021110-1307, USA.
*/

-#include <linux/version.h>
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/highmem.h>

[PATCH 70/82] remove linux/version.h from fs/xfs/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernels

Signed-off-by: Olaf Hering <olh@suse.de>

fs/xfs/linux-2.6/xfs_linux.h |    1 -
fs/xfs/xfs_dmapi.h           |   16 ----------------
2 files changed, 17 deletions(-)

Index: linux-2.6.13-rc2-mm1/fs/xfs/linux-2.6/xfs_linux.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/xfs/linux-2.6/xfs_linux.h
+++ linux-2.6.13-rc2-mm1/fs/xfs/linux-2.6/xfs_linux.h
@@ -87,7 +87,6 @@
#include <linux/init.h>
#include <linux/list.h>
#include <linux/proc_fs.h>
-#include <linux/version.h>
#include <linux/sort.h>

#include <asm/page.h>
Index: linux-2.6.13-rc2-mm1/fs/xfs/xfs_dmapi.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/fs/xfs/xfs_dmapi.h
+++ linux-2.6.13-rc2-mm1/fs/xfs/xfs_dmapi.h
@@ -172,25 +172,9 @@ typedef enum {
/*
*	Based on IO_ISDIRECT, decide which i_ flag is set.
*/
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ?  			      DM_FLAGS_ISEM : 0)
#define DM_SEM_FLAG_WR	(DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_ISEM)
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) && -    (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,22))
-#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? -			      DM_FLAGS_IALLOCSEM_RD : DM_FLAGS_ISEM)
-#define DM_SEM_FLAG_WR	(DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_ISEM)
-#endif
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,21)
-#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? -			      0 : DM_FLAGS_ISEM)
-#define DM_SEM_FLAG_WR	(DM_FLAGS_ISEM)
-#endif
-

/*
*	Macros to turn caller specified delay/block flags into

[PATCH 71/82] remove linux/version.h from include/linux/if_wanpipe_common.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

include/linux/if_wanpipe_common.h |    2 --
1 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/include/linux/if_wanpipe_common.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/if_wanpipe_common.h
+++ linux-2.6.13-rc2-mm1/include/linux/if_wanpipe_common.h
@@ -17,8 +17,6 @@
#ifndef _WANPIPE_SOCK_DRIVER_COMMON_H
#define _WANPIPE_SOCK_DRIVER_COMMON_H

-#include <linux/version.h>
-
typedef struct {
struct net_device *slave;
atomic_t packet_sent;

[PATCH 72/82] remove linux/version.h from include/linux/istallion.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

include/linux/istallion.h |    2 --
1 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/include/linux/istallion.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/istallion.h
+++ linux-2.6.13-rc2-mm1/include/linux/istallion.h
@@ -21,8 +21,6 @@
*	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

-#include <linux/version.h>
-
/*****************************************************************************/
#ifndef	_ISTALLION_H
#define	_ISTALLION_H

[PATCH 73/82] remove linux/version.h from include/linux/phonedev.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

include/linux/phonedev.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/include/linux/phonedev.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/phonedev.h
+++ linux-2.6.13-rc2-mm1/include/linux/phonedev.h
@@ -2,7 +2,6 @@
#define __LINUX_PHONEDEV_H

#include <linux/types.h>
-#include <linux/version.h>

#ifdef __KERNEL__

[PATCH 74/82] remove linux/version.h from include/linux/serialP.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

include/linux/serialP.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/include/linux/serialP.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/serialP.h
+++ linux-2.6.13-rc2-mm1/include/linux/serialP.h
@@ -19,7 +19,6 @@
* For definitions of the flags field, see tty.h
*/

-#include <linux/version.h>
#include <linux/config.h>
#include <linux/termios.h>
#include <linux/workqueue.h>

[PATCH 75/82] remove linux/version.h from include/linux/stallion.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

include/linux/stallion.h |    2 --
1 files changed, 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/include/linux/stallion.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/stallion.h
+++ linux-2.6.13-rc2-mm1/include/linux/stallion.h
@@ -21,8 +21,6 @@
*	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

-#include <linux/version.h>
-
/*****************************************************************************/
#ifndef	_STALLION_H
#define	_STALLION_H

[PATCH 76/82] remove linux/version.h from include/linux/videodev.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

include/linux/videodev.h |    1 -
1 files changed, 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/include/linux/videodev.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/videodev.h
+++ linux-2.6.13-rc2-mm1/include/linux/videodev.h
@@ -3,7 +3,6 @@

#include <linux/compiler.h>
#include <linux/types.h>
-#include <linux/version.h>

#define HAVE_V4L2 1
#include <linux/videodev2.h>

[PATCH 77/82] remove linux/version.h from sound/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernel versions

Signed-off-by: Olaf Hering <olh@suse.de>

include/sound/tea575x-tuner.h |    2 --
sound/mips/au1x00.c           |   19 -------------------
sound/oss/au1550_ac97.c       |    1 -
sound/oss/msnd.c              |    1 -
sound/oss/os.h                |    1 -
sound/oss/rme96xx.c           |    1 -
sound/oss/sh_dac_audio.c      |    1 -
sound/ppc/pmac.h              |    1 -
8 files changed, 27 deletions(-)

Index: linux-2.6.13-rc2-mm1/include/sound/tea575x-tuner.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/sound/tea575x-tuner.h
+++ linux-2.6.13-rc2-mm1/include/sound/tea575x-tuner.h
@@ -34,9 +34,7 @@ struct snd_tea575x_ops {
struct snd_tea575x {
snd_card_t *card;
struct video_device vd;		/* video device */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0)
struct file_operations fops;
-#endif
int dev_nr;			/* requested device number + 1 */
int vd_registered;		/* video device is registered */
int tea5759;			/* 5759 chip is present */
Index: linux-2.6.13-rc2-mm1/sound/mips/au1x00.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/sound/mips/au1x00.c
+++ linux-2.6.13-rc2-mm1/sound/mips/au1x00.c
@@ -39,7 +39,6 @@
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
-#include <linux/version.h>
#include <sound/core.h>
#include <sound/initval.h>
#include <sound/pcm.h>
@@ -50,12 +49,7 @@
MODULE_AUTHOR("Charles Eidsness <charles@cooper-street.com>");
MODULE_DESCRIPTION("Au1000 AC'97 ALSA Driver");
MODULE_LICENSE("GPL");
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
MODULE_SUPPORTED_DEVICE("{{AMD,Au1000 AC'97}}");
-#else
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{AMD,Au1000 AC'97}}");
-#endif

#define chip_t au1000_t

@@ -535,17 +529,12 @@ snd_au1000_ac97_new(void)
{
int err;

-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
ac97_bus_t *pbus;
ac97_template_t ac97;
static ac97_bus_ops_t ops = {
.write = snd_au1000_ac97_write,
.read = snd_au1000_ac97_read,
};
-#else
-	ac97_bus_t bus, *pbus;
-	ac97_t ac97;
-#endif

if ((au1000->ac97_res_port = request_region(AC97C_CONFIG,
sizeof(au1000_ac97_reg_t), "Au1x00 AC97")) == NULL) {
@@ -577,16 +566,8 @@ snd_au1000_ac97_new(void)
spin_unlock(&au1000->ac97_lock);

/* Initialise AC97 middle-layer */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
if ((err = snd_ac97_bus(au1000->card, 0, &ops, au1000, &pbus)) < 0)
return err;
-#else
-	memset(&bus, 0, sizeof(bus));
-	bus.write = snd_au1000_ac97_write;
-	bus.read = snd_au1000_ac97_read;
-	if ((err = snd_ac97_bus(au1000->card, &bus, &pbus)) < 0)
-		return err;
-#endif
memset(&ac97, 0, sizeof(ac97));
ac97.private_data = au1000;
ac97.private_free = snd_au1000_ac97_free;
Index: linux-2.6.13-rc2-mm1/sound/oss/au1550_ac97.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/sound/oss/au1550_ac97.c
+++ linux-2.6.13-rc2-mm1/sound/oss/au1550_ac97.c
@@ -35,7 +35,6 @@

#undef DEBUG

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/ioport.h>
Index: linux-2.6.13-rc2-mm1/sound/oss/msnd.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/sound/oss/msnd.c
+++ linux-2.6.13-rc2-mm1/sound/oss/msnd.c
@@ -24,7 +24,6 @@
*
********************************************************************/

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/sound/oss/os.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/sound/oss/os.h
+++ linux-2.6.13-rc2-mm1/sound/oss/os.h
@@ -5,7 +5,6 @@
#undef  DO_TIMINGS

#include <linux/module.h>
-#include <linux/version.h>

#ifdef __KERNEL__
#include <linux/utsname.h>
Index: linux-2.6.13-rc2-mm1/sound/oss/rme96xx.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/sound/oss/rme96xx.c
+++ linux-2.6.13-rc2-mm1/sound/oss/rme96xx.c
@@ -44,7 +44,6 @@ TODO:
#define RMEVERSION "0.8"
#endif

-#include <linux/version.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/sched.h>
Index: linux-2.6.13-rc2-mm1/sound/oss/sh_dac_audio.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/sound/oss/sh_dac_audio.c
+++ linux-2.6.13-rc2-mm1/sound/oss/sh_dac_audio.c
@@ -2,7 +2,6 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h>
-#include <linux/version.h>
#include <linux/linkage.h>
#include <linux/slab.h>
#include <linux/fs.h>
Index: linux-2.6.13-rc2-mm1/sound/ppc/pmac.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/sound/ppc/pmac.h
+++ linux-2.6.13-rc2-mm1/sound/ppc/pmac.h
@@ -22,7 +22,6 @@
#ifndef __PMAC_H
#define __PMAC_H

-#include <linux/version.h>
#include <sound/control.h>
#include <sound/pcm.h>
#include "awacs.h"

[PATCH 78/82] remove linux/version.h from net/ieee80211/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>

net/ieee80211/ieee80211_crypt.c      |    1 -
net/ieee80211/ieee80211_crypt_ccmp.c |    1 -
net/ieee80211/ieee80211_crypt_tkip.c |    1 -
net/ieee80211/ieee80211_crypt_wep.c  |    1 -
net/ieee80211/ieee80211_module.c     |    1 -
net/ieee80211/ieee80211_rx.c         |    1 -
net/ieee80211/ieee80211_tx.c         |    1 -
net/ieee80211/ieee80211_wx.c         |    1 -
8 files changed, 8 deletions(-)

Index: linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_crypt.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/net/ieee80211/ieee80211_crypt.c
+++ linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_crypt.c
@@ -12,7 +12,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_crypt_ccmp.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/net/ieee80211/ieee80211_crypt_ccmp.c
+++ linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -10,7 +10,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_crypt_tkip.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/net/ieee80211/ieee80211_crypt_tkip.c
+++ linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_crypt_tkip.c
@@ -10,7 +10,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_crypt_wep.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/net/ieee80211/ieee80211_crypt_wep.c
+++ linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_crypt_wep.c
@@ -10,7 +10,6 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
Index: linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_module.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/net/ieee80211/ieee80211_module.c
+++ linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_module.c
@@ -46,7 +46,6 @@
#include <linux/slab.h>
#include <linux/tcp.h>
#include <linux/types.h>
-#include <linux/version.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
#include <asm/uaccess.h>
Index: linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_rx.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/net/ieee80211/ieee80211_rx.c
+++ linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_rx.c
@@ -29,7 +29,6 @@
#include <linux/slab.h>
#include <linux/tcp.h>
#include <linux/types.h>
-#include <linux/version.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
#include <asm/uaccess.h>
Index: linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_tx.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/net/ieee80211/ieee80211_tx.c
+++ linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_tx.c
@@ -39,7 +39,6 @@
#include <linux/slab.h>
#include <linux/tcp.h>
#include <linux/types.h>
-#include <linux/version.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
#include <asm/uaccess.h>
Index: linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_wx.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/net/ieee80211/ieee80211_wx.c
+++ linux-2.6.13-rc2-mm1/net/ieee80211/ieee80211_wx.c
@@ -30,7 +30,6 @@

******************************************************************************/
#include <linux/wireless.h>
-#include <linux/version.h>
#include <linux/kmod.h>
#include <linux/module.h>

[PATCH 79/82] move KERNEL_VERSION from linux/version.h to linux/utsname.h

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

KERNEL_VERSION is a static macro, it doesnt belong to a changing header file.
stuff which relies on UTS_RELEASE or LINUX_VERSION_CODE does already
include linux/version.h
some drivers use KERNEL_VERSION for different purposes

Signed-off-by: Olaf Hering <olh@suse.de>

Makefile                |    1 -
include/linux/utsname.h |    3 +++
2 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/include/linux/utsname.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/linux/utsname.h
+++ linux-2.6.13-rc2-mm1/include/linux/utsname.h
@@ -33,4 +33,7 @@ struct new_utsname {
extern struct new_utsname system_utsname;

extern struct rw_semaphore uts_sem;
+
+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+
#endif
Index: linux-2.6.13-rc2-mm1/Makefile
===================================================================
--- linux-2.6.13-rc2-mm1.orig/Makefile
+++ linux-2.6.13-rc2-mm1/Makefile
@@ -836,7 +836,6 @@ define filechk_version.h
fi;  	(echo #define UTS_RELEASE "$(KERNELRELEASE)";  	  echo #define LINUX_VERSION_CODE `expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL)`; -	 echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';  	)
endef

[PATCH 80/82] remove linux/version.h from drivers/media/

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

use linux/utsname.h to get KERNEL_VERSION macro

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/media/video/bttvp.h           |    2 +-
drivers/media/video/cx88/cx88.h       |    2 +-
drivers/media/video/saa7134/saa7134.h |    2 +-
drivers/media/video/zoran_driver.c    |    2 +-
include/media/saa7146.h               |    2 +-
5 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/media/video/bttvp.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/bttvp.h
+++ linux-2.6.13-rc2-mm1/drivers/media/video/bttvp.h
@@ -26,7 +26,7 @@
#ifndef _BTTVP_H_
#define _BTTVP_H_

-#include <linux/version.h>
+#include <linux/utsname.h>
#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,15)

#include <linux/types.h>
Index: linux-2.6.13-rc2-mm1/drivers/media/video/cx88/cx88.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/cx88/cx88.h
+++ linux-2.6.13-rc2-mm1/drivers/media/video/cx88/cx88.h
@@ -35,7 +35,7 @@
#include "btcx-risc.h"
#include "cx88-reg.h"

-#include <linux/version.h>
+#include <linux/utsname.h>
#define CX88_VERSION_CODE KERNEL_VERSION(0,0,4)

#ifndef TRUE
Index: linux-2.6.13-rc2-mm1/drivers/media/video/saa7134/saa7134.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/saa7134/saa7134.h
+++ linux-2.6.13-rc2-mm1/drivers/media/video/saa7134/saa7134.h
@@ -20,7 +20,7 @@
*  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

-#include <linux/version.h>
+#include <linux/utsname.h>
#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,13)

#include <linux/pci.h>
Index: linux-2.6.13-rc2-mm1/drivers/media/video/zoran_driver.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/video/zoran_driver.c
+++ linux-2.6.13-rc2-mm1/drivers/media/video/zoran_driver.c
@@ -45,7 +45,7 @@
*/

#include <linux/config.h>
-#include <linux/version.h>
+#include <linux/utsname.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/delay.h>
Index: linux-2.6.13-rc2-mm1/include/media/saa7146.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/include/media/saa7146.h
+++ linux-2.6.13-rc2-mm1/include/media/saa7146.h
@@ -1,7 +1,6 @@
#ifndef __SAA7146__
#define __SAA7146__

-#include <linux/version.h>	/* for version macros */
#include <linux/module.h>	/* for module-version */
#include <linux/delay.h>	/* for delay-stuff */
#include <linux/slab.h>		/* for kmalloc/kfree */
@@ -14,6 +13,7 @@
#include <linux/stringify.h>
#include <linux/vmalloc.h>	/* for vmalloc() */
#include <linux/mm.h>		/* for vmalloc_to_page() */
+#include <linux/utsname.h>	/* for KERNEL_VERSION */

#define SAA7146_VERSION_CODE KERNEL_VERSION(0,5,0)

[PATCH 81/82] remove linux/version.h from drivers/usb

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

use linux/utsname.h to get KERNEL_VERSION macro

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/usb/media/sn9c102.h |    2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/usb/media/sn9c102.h
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/usb/media/sn9c102.h
+++ linux-2.6.13-rc2-mm1/drivers/usb/media/sn9c102.h
@@ -21,7 +21,7 @@
#ifndef _SN9C102_H_
#define _SN9C102_H_

-#include <linux/version.h>
+#include <linux/utsname.h>
#include <linux/usb.h>
#include <linux/videodev.h>
#include <linux/device.h>

[PATCH 82/82] remove linux/version.h from drivers/video/matrox/matroxfb_base.c

[Olaf Hering]

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

get KERNEL_VERSION from linux/utsname.h

Signed-off-by: Olaf Hering <olh@suse.de>

drivers/video/matrox/matroxfb_base.c |    2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/video/matrox/matroxfb_base.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/video/matrox/matroxfb_base.c
+++ linux-2.6.13-rc2-mm1/drivers/video/matrox/matroxfb_base.c
@@ -101,7 +101,7 @@

/* make checkconfig does not check included files... */
#include <linux/config.h>
-#include <linux/version.h>
+#include <linux/utsname.h>

#include "matroxfb_base.h"
#include "matroxfb_misc.h"

Re: [PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[David S. Miller]

An 82 entry patchbomb to the mailing lists is unacceptable and is
going to kill vger.kernel.org, please don't do this.

If you cannot condense your patch set into a smaller set of patches (I
think you really could for this one), then only post say 10 or so at a
time and wait for review and integration.

Kernel janitor-like patches split up their work _FAR_ too much.  They
post one patch per driver, or even per-file, for something as simple
as removing the use of a redundant header file.  That's totally
rediculious, and bloats up the kernel changelog history for no good
reason.  Instead, you should just post one big patch for all of
drivers/, one for all of net/, something like that.

Thanks.

Re: [PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[Jeff Garzik]

Olaf Hering wrote:
> The following series of patches removes almost all inclusions
> of linux/version.h. The 3 #defines are unused in most of the touched files.
> 
> A few drivers use the simple KERNEL_VERSION(a,b,c) macro, which is unfortunatly
> in linux/version.h. This define moved to linux/utsname.h
> 
> There are also lots of #ifdef for long obsolete kernels, this will go as well.

I agree with most of the changes (and I say "most" simply because I 
haven't reviewed all of them), but it would be better to coalesce these 
100+ patches into much smaller patch clumps.

"split your patches up" mantra can get taken too far.  We want -logical 
changes- separated out, and your patches are largely a single logical 
change (remove old code).

	Jeff

Re: [PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[Jeff Garzik]

David S. Miller wrote:
> Kernel janitor-like patches split up their work _FAR_ too much.  They
> post one patch per driver, or even per-file, for something as simple
> as removing the use of a redundant header file.  That's totally
> rediculious, and bloats up the kernel changelog history for no good
> reason.  Instead, you should just post one big patch for all of
> drivers/, one for all of net/, something like that.


Whoops, in an email just sent, I repeated what you said here, except 
that you said it better :)

100% agreed...

	Jeff

Re: [PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[Josh Boyer]

On Sun, 2005-07-10 at 19:35 +0000, Olaf Hering wrote:
> The following series of patches removes almost all inclusions
> of linux/version.h. The 3 #defines are unused in most of the touched files.
> 
> A few drivers use the simple KERNEL_VERSION(a,b,c) macro, which is unfortunatly
> in linux/version.h. This define moved to linux/utsname.h
> 
> There are also lots of #ifdef for long obsolete kernels, this will go as well.

Unless I missed it in the patch-bomb, you missed fs/jffs2/ and
include/linux/jffs2_fs_i.h.

josh

Re: [PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[Nish Aravamudan]

On 7/10/05, Jeff Garzik <jgarzik@pobox.com> wrote:
> David S. Miller wrote:
> > Kernel janitor-like patches split up their work _FAR_ too much.  They
> > post one patch per driver, or even per-file, for something as simple
> > as removing the use of a redundant header file.  That's totally
> > rediculious, and bloats up the kernel changelog history for no good
> > reason.  Instead, you should just post one big patch for all of
> > drivers/, one for all of net/, something like that.
> 
> 
> Whoops, in an email just sent, I repeated what you said here, except
> that you said it better :)
> 
> 100% agreed...

A quick question here regarding the possibility of one logical change
for all of drivers/. Does that hold true for *any* logical change?

Intuitively, I would say no. My biggest concern with that is there are
many Maintainers listed for particular SCSI drivers, e.g., as well as
one for the SCSI subsystem. If those individual driver maintainers'
files are being modified, should they be CC'ed, or is the big patch
just sent to the SCSI maintainer (in this example)? I just want to
make sure the correct patch-chain is respected.

There is already a patch pending for the KJ FAQ from Domen Puncer
(http://lists.osdl.org/pipermail/kernel-janitors/2005-July/004438.html)
to note that the same logical change can be made for all of
drivers/net, e.g., in one patch, but it's still not quite clear how
the appropriate CCs should be respected. We should probably make that
as clear as possible now.

Thanks,
Nish

Re: [PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[David S. Miller]

From: Nish Aravamudan <nish.aravamudan@gmail.com>
Date: Sun, 10 Jul 2005 21:18:15 -0700

> A quick question here regarding the possibility of one logical change
> for all of drivers/. Does that hold true for *any* logical change?
> 
> Intuitively, I would say no. My biggest concern with that is there are
> many Maintainers listed for particular SCSI drivers, e.g., as well as
> one for the SCSI subsystem. If those individual driver maintainers'
> files are being modified, should they be CC'ed, or is the big patch
> just sent to the SCSI maintainer (in this example)? I just want to
> make sure the correct patch-chain is respected.

Please just use common sense.  It depends upon how intrusive the
change is.  In most cases, the driver author's have to learn to
"let go" and let these general cleanups happen.  The onus is on
them to follow upstream when the submit new changes of their own.

Some examples:

1) Deleting superfluous header file.

   Just do a clean sweep.

2) Adding a new argument to an existing interface.

   Just do a clean sweep.

3) Transitioning drivers over to a new exception handling mechanism.

   Probably want to do submit a patch for driver at a time.  You
   should be doing more a few of these driver conversions at a time
   anyways, so no risk of patch bombing.

4) Straight forward transformations, for example hiding data
   structure member access behind a function or macro.

   Just do a clean sweep in large chunks.

Again, use common sense.  If you're just crossing your "T"'s and
dotting your "i"'s, don't spam everyone with a thousand patches
for such a cleanup.

Re: [PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[Nish Aravamudan]

On 7/10/05, David S. Miller <davem@davemloft.net> wrote:
> From: Nish Aravamudan <nish.aravamudan@gmail.com>
> Date: Sun, 10 Jul 2005 21:18:15 -0700
> 
> > A quick question here regarding the possibility of one logical change
> > for all of drivers/. Does that hold true for *any* logical change?
> >
> > Intuitively, I would say no. My biggest concern with that is there are
> > many Maintainers listed for particular SCSI drivers, e.g., as well as
> > one for the SCSI subsystem. If those individual driver maintainers'
> > files are being modified, should they be CC'ed, or is the big patch
> > just sent to the SCSI maintainer (in this example)? I just want to
> > make sure the correct patch-chain is respected.
> 
> Please just use common sense.  It depends upon how intrusive the
> change is.  In most cases, the driver author's have to learn to
> "let go" and let these general cleanups happen.  The onus is on
> them to follow upstream when the submit new changes of their own.
> 
> Some examples:
> 
> 1) Deleting superfluous header file.
> 
>    Just do a clean sweep.
> 
> 2) Adding a new argument to an existing interface.
> 
>    Just do a clean sweep.
> 
> 3) Transitioning drivers over to a new exception handling mechanism.
> 
>    Probably want to do submit a patch for driver at a time.  You
>    should be doing more a few of these driver conversions at a time
>    anyways, so no risk of patch bombing.
> 
> 4) Straight forward transformations, for example hiding data
>    structure member access behind a function or macro.
> 
>    Just do a clean sweep in large chunks.
> 
> Again, use common sense.  If you're just crossing your "T"'s and
> dotting your "i"'s, don't spam everyone with a thousand patches
> for such a cleanup.

Great! Thanks for the quick feedback. I'll make sure this gets added
to the KJ FAQ (mayhap even verbatim :) )

Thanks,
Nish

Re: [linux-dvb-maintainer] [PATCH 21/82] remove linux/version.h from drivers/media/

[Johannes Stezenbach]

On Sun, Jul 10, 2005 at 07:35:29PM +0000, Olaf Hering wrote:
> 
> changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
> 
> remove code for obsolete kernels, drivers/media/video/bttvp.h has:
> #define BTTV_VERSION_CODE KERNEL_VERSION(0,9,15)
> 
> Signed-off-by: Olaf Hering <olh@suse.de>
> 
> drivers/media/common/saa7146_fops.c     |    1 -
> drivers/media/common/saa7146_i2c.c      |    5 -----
> drivers/media/dvb/cinergyT2/cinergyT2.c |    1 -
> drivers/media/dvb/dvb-core/dvb_net.c    |    5 -----
> drivers/media/dvb/frontends/dib3000mb.c |    1 -
> drivers/media/dvb/frontends/dib3000mc.c |    1 -
> include/media/saa7146.h                 |   10 ----------

I am puzzled because the saa7146 driver in DVB CVS has different
KERNEL_VERSION #ifdefs. I am currently trying to find out if
they can be removed all together from CVS.

In any event the patch does the right thing and should be applied.

> drivers/media/video/arv.c               |    1 -
> drivers/media/video/bttv-cards.c        |   15 ---------------
> drivers/media/video/zr36016.c           |    1 -
> drivers/media/video/zr36050.c           |    1 -
> drivers/media/video/zr36060.c           |    1 -
> include/media/ir-common.h               |    1 -

These files are in video4linux CVS. I forwarded the patch to
the vide4linux list.

Thanks,
Johannes

Re: [PATCH 0/82] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason.

[Rogier Wolff]

On Sun, Jul 10, 2005 at 09:18:15PM -0700, Nish Aravamudan wrote:
> one for the SCSI subsystem. If those individual driver maintainers'
> files are being modified, should they be CC'ed, or is the big patch
> just sent to the SCSI maintainer (in this example)? I just want to
> make sure the correct patch-chain is respected.

As a patch maintainer, CCed on ONE of the 82 patches, I wouldn't have
minded getting CCed on a patch that included the change to my driver. 
(as chunk xx/82 in the diff).

	Roger. 

-- 
** R.E.Wolff@BitWizard.nl ** http://www.BitWizard.nl/ ** +31-15-2600998 **
*-- BitWizard writes Linux device drivers for any device you may have! --*
Q: It doesn't work. A: Look buddy, doesn't work is an ambiguous statement. 
Does it sit on the couch all day? Is it unemployed? Please be specific! 
Define 'it' and what it isn't doing. --------- Adapted from lxrbot FAQ

Re: [PATCH 58/82] remove linux/version.h from drivers/usb

[Greg KH]

On Sun, Jul 10, 2005 at 07:36:06PM +0000, Olaf Hering wrote:
> 
> changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
> 
> remove code for obsolete kernels from drivers/usb/media/pwc/pwc-ctrl.c
> and drivers/usb/misc/sisusbvga/sisusb.h

This, and your other patches in this series, seem to have the leading
whitespace stripped off, making it very tough to apply.  Care to redo
them?

thanks,

greg k-h

Re: [PATCH 18/82] remove linux/version.h from drivers/infiniband/

[Roland Dreier]

Thanks, I've finally applied this to our repository, and will merge it
upstream for 2.6.14 (unless it shows up by some other route first).

 - R.

Re: [PATCH 35/82] remove linux/version.h from drivers/scsi/cpqfcTSinit.c

[James Bottomley]

On Sun, 2005-07-10 at 19:35 +0000, Olaf Hering wrote:
> changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
> remove code for obsolete kernels

I can't seem to get any of these patches to apply:

Applying 'remove linux/version.h from drivers/scsi/cpqfcTSinit.c'

patching file drivers/scsi/cpqfcTSinit.c
patch: **** malformed patch at line 4: #include <linux/config.h>

I've no idea what patch's problem is ... as far as I can tell there are
no line breaks or illegal characters in the email.

James

Re: [PATCH 35/82] remove linux/version.h from drivers/scsi/cpqfcTSinit.c

[Andrew Morton]

James Bottomley <James.Bottomley@SteelEye.com> wrote:
>
> On Sun, 2005-07-10 at 19:35 +0000, Olaf Hering wrote:
> > changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
> > remove code for obsolete kernels
> 
> I can't seem to get any of these patches to apply:
> 
> Applying 'remove linux/version.h from drivers/scsi/cpqfcTSinit.c'
> 
> patching file drivers/scsi/cpqfcTSinit.c
> patch: **** malformed patch at line 4: #include <linux/config.h>
> 
> I've no idea what patch's problem is ... as far as I can tell there are
> no line breaks or illegal characters in the email.
> 

I suggest you not apply these patches - I have them all lined up and fixed
in -mm and we can do it in one hit post-2.6.13.

Re: [PATCH 66/82] remove linux/version.h from fs/hfs/

[Eric Piel]

10.07.2005 21:36, Olaf Hering wrote/a écrit:
> changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
Hello,

I've just changed LOCALVERSION on 2.6.14 and noticed that the patches 
for hfs and hfsplus had still not made their way. As I couldn't find any 
tree which contains them, I was wondering if they wouldn't have been 
"lost in space" ?

Eric

> 
> Signed-off-by: Olaf Hering <olh@suse.de>
> 
> fs/hfs/hfs_fs.h |    1 -
> fs/hfs/inode.c  |    1 -
> 2 files changed, 2 deletions(-)
> 
> Index: linux-2.6.13-rc2-mm1/fs/hfs/hfs_fs.h
> ===================================================================
> --- linux-2.6.13-rc2-mm1.orig/fs/hfs/hfs_fs.h
> +++ linux-2.6.13-rc2-mm1/fs/hfs/hfs_fs.h
> @@ -9,7 +9,6 @@
> #ifndef _LINUX_HFS_FS_H
> #define _LINUX_HFS_FS_H
> 
> -#include <linux/version.h>
> #include <linux/slab.h>
> #include <linux/types.h>
> #include <linux/buffer_head.h>
> Index: linux-2.6.13-rc2-mm1/fs/hfs/inode.c
> ===================================================================
> --- linux-2.6.13-rc2-mm1.orig/fs/hfs/inode.c
> +++ linux-2.6.13-rc2-mm1/fs/hfs/inode.c
> @@ -12,7 +12,6 @@
> */
> 
> #include <linux/pagemap.h>
> -#include <linux/version.h>
> #include <linux/mpage.h>
> 
> #include "hfs_fs.h"

Re: [PATCH 66/82] remove linux/version.h from fs/hfs/

[Olaf Hering]

 On Sat, Nov 05, Eric Piel wrote:

> 10.07.2005 21:36, Olaf Hering wrote/a écrit:
> >changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
> Hello,
> 
> I've just changed LOCALVERSION on 2.6.14 and noticed that the patches 
> for hfs and hfsplus had still not made their way. As I couldn't find any 
> tree which contains them, I was wondering if they wouldn't have been 
> "lost in space" ?

I noticed that as well today. There are many more places where version.h
is still included...

find * -name "*.[ch]" | xargs grep -El '<linux/version.h>' | wc -l
213

I did send it for stuff like net/ieee80211/ieee80211_crypt_tkip.c 

-- 
short story of a lazy sysadmin:
 alias appserv=wotan