From: Olaf Hering <olh@suse.de>
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
This patch:
changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
ppc: use system_utsname for CONFIG_BOOTX_TEXT welcome message
ppc64: use system_utsname for progress and debug header
remove code for obsolete kernel versions
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
arch/cris/arch-v10/drivers/pcf8563.c | 1 -
arch/cris/arch-v10/kernel/fasttimer.c | 1 -
arch/parisc/kernel/asm-offsets.c | 1 -
arch/ppc/syslib/btext.c | 6 ++++--
arch/ppc/syslib/prom.c | 1 -
arch/ppc/syslib/prom_init.c | 1 -
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 -
drivers/block/amiflop.c | 1 -
drivers/char/ip2.c | 1 -
drivers/char/mwave/tp3780i.c | 1 -
drivers/char/mxser.c | 1 -
drivers/char/specialix.c | 1 -
drivers/char/tpm/tpm.h | 1 -
drivers/char/viocons.c | 1 -
drivers/char/viotape.c | 1 -
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 -
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 -
drivers/md/bitmap.c | 1 -
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/dvb/ttusb-dec/ttusb_dec.c | 1 -
drivers/media/video/arv.c | 1 -
drivers/media/video/zr36016.c | 1 -
drivers/media/video/zr36050.c | 1 -
drivers/media/video/zr36060.c | 1 -
drivers/misc/hdpuftrs/hdpu_cpustate.c | 1 -
drivers/misc/hdpuftrs/hdpu_nexus.c | 1 -
drivers/misc/ibmasm/ibmasm.h | 1 -
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 -
drivers/pcmcia/au1000_pb1x00.c | 1 -
drivers/pcmcia/au1000_xxs1500.c | 1 -
drivers/s390/net/claw.c | 1 -
drivers/telephony/ixj.h | 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 -----
drivers/video/backlight/backlight.c | 1 -
drivers/video/backlight/lcd.c | 1 -
drivers/video/intelfb/intelfbdrv.c | 1 -
drivers/video/intelfb/intelfbhw.c | 1 -
fs/adfs/adfs.h | 1 -
fs/hfs/hfs_fs.h | 1 -
fs/hfs/inode.c | 1 -
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 -
fs/hostfs/hostfs_kern.c | 1 -
fs/xfs/linux-2.6/xfs_linux.h | 1 -
fs/xfs/xfs_dmapi.h | 16 ----------------
include/linux/if_wanpipe_common.h | 2 --
include/linux/istallion.h | 2 --
include/linux/mtd/cfi.h | 1 -
include/linux/mtd/mtd.h | 1 -
include/linux/phonedev.h | 1 -
include/linux/stallion.h | 2 --
include/linux/videodev.h | 1 -
include/media/ir-common.h | 1 -
include/media/saa7146.h | 10 ----------
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 -
109 files changed, 8 insertions(+), 211 deletions(-)
diff -puN arch/cris/arch-v10/drivers/pcf8563.c~remove-linux-versionh-includes arch/cris/arch-v10/drivers/pcf8563.c
--- devel/arch/cris/arch-v10/drivers/pcf8563.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/cris/arch-v10/drivers/pcf8563.c 2005-07-25 19:17:32.000000000 -0700
@@ -19,7 +19,6 @@
*/
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
diff -puN arch/cris/arch-v10/kernel/fasttimer.c~remove-linux-versionh-includes arch/cris/arch-v10/kernel/fasttimer.c
--- devel/arch/cris/arch-v10/kernel/fasttimer.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/cris/arch-v10/kernel/fasttimer.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN arch/parisc/kernel/asm-offsets.c~remove-linux-versionh-includes arch/parisc/kernel/asm-offsets.c
--- devel/arch/parisc/kernel/asm-offsets.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/parisc/kernel/asm-offsets.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN arch/ppc64/kernel/btext.c~remove-linux-versionh-includes arch/ppc64/kernel/btext.c
--- devel/arch/ppc64/kernel/btext.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/btext.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN arch/ppc64/kernel/prom.c~remove-linux-versionh-includes arch/ppc64/kernel/prom.c
--- devel/arch/ppc64/kernel/prom.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/prom.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN arch/ppc64/kernel/prom_init.c~remove-linux-versionh-includes arch/ppc64/kernel/prom_init.c
--- devel/arch/ppc64/kernel/prom_init.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/prom_init.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN arch/ppc64/kernel/pSeries_setup.c~remove-linux-versionh-includes arch/ppc64/kernel/pSeries_setup.c
--- devel/arch/ppc64/kernel/pSeries_setup.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/pSeries_setup.c 2005-07-25 19:17:32.000000000 -0700
@@ -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 ppc64\n", 0);
- ppc_md.progress(UTS_RELEASE, 0);
+ ppc_md.progress(system_utsname.version, 0);
return 0;
}
diff -puN arch/ppc64/kernel/setup.c~remove-linux-versionh-includes arch/ppc64/kernel/setup.c
--- devel/arch/ppc64/kernel/setup.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/setup.c 2005-07-25 19:17:32.000000000 -0700
@@ -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 %s\n", UTS_RELEASE);
+ printk("Starting Linux PPC64 %s\n", system_utsname.version);
printk("-----------------------------------------------------\n");
printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size);
diff -puN arch/ppc64/kernel/vio.c~remove-linux-versionh-includes arch/ppc64/kernel/vio.c
--- devel/arch/ppc64/kernel/vio.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/vio.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN arch/ppc/syslib/btext.c~remove-linux-versionh-includes arch/ppc/syslib/btext.c
--- devel/arch/ppc/syslib/btext.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc/syslib/btext.c 2005-07-25 19:17:32.000000000 -0700
@@ -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");
diff -puN arch/ppc/syslib/prom.c~remove-linux-versionh-includes arch/ppc/syslib/prom.c
--- devel/arch/ppc/syslib/prom.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc/syslib/prom.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN arch/ppc/syslib/prom_init.c~remove-linux-versionh-includes arch/ppc/syslib/prom_init.c
--- devel/arch/ppc/syslib/prom_init.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/arch/ppc/syslib/prom_init.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/block/amiflop.c~remove-linux-versionh-includes drivers/block/amiflop.c
--- devel/drivers/block/amiflop.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/block/amiflop.c 2005-07-25 19:17:32.000000000 -0700
@@ -1816,7 +1816,6 @@ out_blkdev:
}
#ifdef MODULE
-#include <linux/version.h>
int init_module(void)
{
diff -puN drivers/char/ip2.c~remove-linux-versionh-includes drivers/char/ip2.c
--- devel/drivers/char/ip2.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/char/ip2.c 2005-07-25 19:17:32.000000000 -0700
@@ -7,7 +7,6 @@
//
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/wait.h>
diff -puN drivers/char/mwave/tp3780i.c~remove-linux-versionh-includes drivers/char/mwave/tp3780i.c
--- devel/drivers/char/mwave/tp3780i.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/char/mwave/tp3780i.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/char/mxser.c~remove-linux-versionh-includes drivers/char/mxser.c
--- devel/drivers/char/mxser.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/char/mxser.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/char/specialix.c~remove-linux-versionh-includes drivers/char/specialix.c
--- devel/drivers/char/specialix.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/char/specialix.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/char/tpm/tpm.h~remove-linux-versionh-includes drivers/char/tpm/tpm.h
--- devel/drivers/char/tpm/tpm.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/char/tpm/tpm.h 2005-07-25 19:17:32.000000000 -0700
@@ -19,7 +19,6 @@
*
*/
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/fs.h>
diff -puN drivers/char/viocons.c~remove-linux-versionh-includes drivers/char/viocons.c
--- devel/drivers/char/viocons.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/char/viocons.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/char/viotape.c~remove-linux-versionh-includes drivers/char/viotape.c
--- devel/drivers/char/viotape.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/char/viotape.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/infiniband/core/cache.c~remove-linux-versionh-includes drivers/infiniband/core/cache.c
--- devel/drivers/infiniband/core/cache.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/infiniband/core/cache.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/infiniband/hw/mthca/mthca_main.c~remove-linux-versionh-includes drivers/infiniband/hw/mthca/mthca_main.c
--- devel/drivers/infiniband/hw/mthca/mthca_main.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/infiniband/hw/mthca/mthca_main.c 2005-07-25 19:17:32.000000000 -0700
@@ -34,7 +34,6 @@
*/
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>
diff -puN drivers/infiniband/ulp/ipoib/ipoib_main.c~remove-linux-versionh-includes drivers/infiniband/ulp/ipoib/ipoib_main.c
--- devel/drivers/infiniband/ulp/ipoib/ipoib_main.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/infiniband/ulp/ipoib/ipoib_main.c 2005-07-25 19:17:32.000000000 -0700
@@ -34,7 +34,6 @@
#include "ipoib.h"
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
diff -puN drivers/infiniband/ulp/ipoib/ipoib_vlan.c~remove-linux-versionh-includes drivers/infiniband/ulp/ipoib/ipoib_vlan.c
--- devel/drivers/infiniband/ulp/ipoib/ipoib_vlan.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/infiniband/ulp/ipoib/ipoib_vlan.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/isdn/divert/divert_init.c~remove-linux-versionh-includes drivers/isdn/divert/divert_init.c
--- devel/drivers/isdn/divert/divert_init.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/divert/divert_init.c 2005-07-25 19:17:32.000000000 -0700
@@ -10,7 +10,6 @@
*/
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/kernel.h>
diff -puN drivers/isdn/divert/divert_procfs.c~remove-linux-versionh-includes drivers/isdn/divert/divert_procfs.c
--- devel/drivers/isdn/divert/divert_procfs.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/divert/divert_procfs.c 2005-07-25 19:17:32.000000000 -0700
@@ -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
diff -puN drivers/isdn/divert/isdn_divert.c~remove-linux-versionh-includes drivers/isdn/divert/isdn_divert.c
--- devel/drivers/isdn/divert/isdn_divert.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/divert/isdn_divert.c 2005-07-25 19:17:32.000000000 -0700
@@ -9,7 +9,6 @@
*
*/
-#include <linux/version.h>
#include <linux/proc_fs.h>
#include "isdn_divert.h"
diff -puN drivers/isdn/hisax/hisax_fcpcipnp.c~remove-linux-versionh-includes drivers/isdn/hisax/hisax_fcpcipnp.c
--- devel/drivers/isdn/hisax/hisax_fcpcipnp.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/hisax/hisax_fcpcipnp.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/isdn/hisax/st5481_init.c~remove-linux-versionh-includes drivers/isdn/hisax/st5481_init.c
--- devel/drivers/isdn/hisax/st5481_init.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/hisax/st5481_init.c 2005-07-25 19:17:32.000000000 -0700
@@ -25,7 +25,6 @@
*/
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb.h>
diff -puN drivers/isdn/hysdn/hycapi.c~remove-linux-versionh-includes drivers/isdn/hysdn/hycapi.c
--- devel/drivers/isdn/hysdn/hycapi.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/hysdn/hycapi.c 2005-07-25 19:17:32.000000000 -0700
@@ -11,7 +11,6 @@
*/
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/signal.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
diff -puN drivers/isdn/hysdn/hysdn_init.c~remove-linux-versionh-includes drivers/isdn/hysdn/hysdn_init.c
--- devel/drivers/isdn/hysdn/hysdn_init.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/hysdn/hysdn_init.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/isdn/hysdn/hysdn_net.c~remove-linux-versionh-includes drivers/isdn/hysdn/hysdn_net.c
--- devel/drivers/isdn/hysdn/hysdn_net.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/hysdn/hysdn_net.c 2005-07-25 19:17:32.000000000 -0700
@@ -14,7 +14,6 @@
*/
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/signal.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
diff -puN drivers/isdn/hysdn/hysdn_procconf.c~remove-linux-versionh-includes drivers/isdn/hysdn/hysdn_procconf.c
--- devel/drivers/isdn/hysdn/hysdn_procconf.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/hysdn/hysdn_procconf.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/isdn/hysdn/hysdn_proclog.c~remove-linux-versionh-includes drivers/isdn/hysdn/hysdn_proclog.c
--- devel/drivers/isdn/hysdn/hysdn_proclog.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/hysdn/hysdn_proclog.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/isdn/i4l/isdn_common.c~remove-linux-versionh-includes drivers/isdn/i4l/isdn_common.c
--- devel/drivers/isdn/i4l/isdn_common.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/i4l/isdn_common.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/isdn/icn/icn.h~remove-linux-versionh-includes drivers/isdn/icn/icn.h
--- devel/drivers/isdn/icn/icn.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/icn/icn.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/isdn/isdnloop/isdnloop.h~remove-linux-versionh-includes drivers/isdn/isdnloop/isdnloop.h
--- devel/drivers/isdn/isdnloop/isdnloop.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/isdnloop/isdnloop.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/isdn/sc/includes.h~remove-linux-versionh-includes drivers/isdn/sc/includes.h
--- devel/drivers/isdn/sc/includes.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/isdn/sc/includes.h 2005-07-25 19:17:32.000000000 -0700
@@ -4,7 +4,6 @@
*
*/
-#include <linux/version.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <linux/delay.h>
diff -puN drivers/md/bitmap.c~remove-linux-versionh-includes drivers/md/bitmap.c
--- devel/drivers/md/bitmap.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/md/bitmap.c 2005-07-25 19:17:32.000000000 -0700
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/init.h>
diff -puN drivers/media/common/saa7146_fops.c~remove-linux-versionh-includes drivers/media/common/saa7146_fops.c
--- devel/drivers/media/common/saa7146_fops.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/common/saa7146_fops.c 2005-07-25 19:17:32.000000000 -0700
@@ -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)
diff -puN drivers/media/common/saa7146_i2c.c~remove-linux-versionh-includes drivers/media/common/saa7146_i2c.c
--- devel/drivers/media/common/saa7146_i2c.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/common/saa7146_i2c.c 2005-07-25 19:17:32.000000000 -0700
@@ -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;
diff -puN drivers/media/dvb/cinergyT2/cinergyT2.c~remove-linux-versionh-includes drivers/media/dvb/cinergyT2/cinergyT2.c
--- devel/drivers/media/dvb/cinergyT2/cinergyT2.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/dvb/cinergyT2/cinergyT2.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/media/dvb/dvb-core/dvb_net.c~remove-linux-versionh-includes drivers/media/dvb/dvb-core/dvb_net.c
--- devel/drivers/media/dvb/dvb-core/dvb_net.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/dvb/dvb-core/dvb_net.c 2005-07-25 19:17:32.000000000 -0700
@@ -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)
diff -puN drivers/media/dvb/frontends/dib3000mb.c~remove-linux-versionh-includes drivers/media/dvb/frontends/dib3000mb.c
--- devel/drivers/media/dvb/frontends/dib3000mb.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/dib3000mb.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/media/dvb/frontends/dib3000mc.c~remove-linux-versionh-includes drivers/media/dvb/frontends/dib3000mc.c
--- devel/drivers/media/dvb/frontends/dib3000mc.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/dib3000mc.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/media/dvb/ttusb-dec/ttusb_dec.c~remove-linux-versionh-includes drivers/media/dvb/ttusb-dec/ttusb_dec.c
--- devel/drivers/media/dvb/ttusb-dec/ttusb_dec.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/media/video/arv.c~remove-linux-versionh-includes drivers/media/video/arv.c
--- devel/drivers/media/video/arv.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/video/arv.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/media/video/zr36016.c~remove-linux-versionh-includes drivers/media/video/zr36016.c
--- devel/drivers/media/video/zr36016.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/video/zr36016.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/media/video/zr36050.c~remove-linux-versionh-includes drivers/media/video/zr36050.c
--- devel/drivers/media/video/zr36050.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/video/zr36050.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/media/video/zr36060.c~remove-linux-versionh-includes drivers/media/video/zr36060.c
--- devel/drivers/media/video/zr36060.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/media/video/zr36060.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/misc/hdpuftrs/hdpu_cpustate.c~remove-linux-versionh-includes drivers/misc/hdpuftrs/hdpu_cpustate.c
--- devel/drivers/misc/hdpuftrs/hdpu_cpustate.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/misc/hdpuftrs/hdpu_cpustate.c 2005-07-25 19:17:32.000000000 -0700
@@ -14,7 +14,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
diff -puN drivers/misc/hdpuftrs/hdpu_nexus.c~remove-linux-versionh-includes drivers/misc/hdpuftrs/hdpu_nexus.c
--- devel/drivers/misc/hdpuftrs/hdpu_nexus.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/misc/hdpuftrs/hdpu_nexus.c 2005-07-25 19:17:32.000000000 -0700
@@ -14,7 +14,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/proc_fs.h>
diff -puN drivers/misc/ibmasm/ibmasm.h~remove-linux-versionh-includes drivers/misc/ibmasm/ibmasm.h
--- devel/drivers/misc/ibmasm/ibmasm.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/misc/ibmasm/ibmasm.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/mtd/chips/cfi_cmdset_0020.c~remove-linux-versionh-includes drivers/mtd/chips/cfi_cmdset_0020.c
--- devel/drivers/mtd/chips/cfi_cmdset_0020.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/mtd/chips/cfi_cmdset_0020.c 2005-07-25 19:17:32.000000000 -0700
@@ -20,7 +20,6 @@
* - Plugged memory leak in cfi_staa_writev().
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
diff -puN drivers/mtd/devices/pmc551.c~remove-linux-versionh-includes drivers/mtd/devices/pmc551.c
--- devel/drivers/mtd/devices/pmc551.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/mtd/devices/pmc551.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/mtd/maps/ebony.c~remove-linux-versionh-includes drivers/mtd/maps/ebony.c
--- devel/drivers/mtd/maps/ebony.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/ebony.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/mtd/maps/ocotea.c~remove-linux-versionh-includes drivers/mtd/maps/ocotea.c
--- devel/drivers/mtd/maps/ocotea.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/ocotea.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/mtd/maps/walnut.c~remove-linux-versionh-includes drivers/mtd/maps/walnut.c
--- devel/drivers/mtd/maps/walnut.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/walnut.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/mtd/nand/au1550nd.c~remove-linux-versionh-includes drivers/mtd/nand/au1550nd.c
--- devel/drivers/mtd/nand/au1550nd.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/mtd/nand/au1550nd.c 2005-07-25 19:17:32.000000000 -0700
@@ -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
diff -puN drivers/mtd/nand/autcpu12.c~remove-linux-versionh-includes drivers/mtd/nand/autcpu12.c
--- devel/drivers/mtd/nand/autcpu12.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/mtd/nand/autcpu12.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/pcmcia/au1000_pb1x00.c~remove-linux-versionh-includes drivers/pcmcia/au1000_pb1x00.c
--- devel/drivers/pcmcia/au1000_pb1x00.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/pcmcia/au1000_pb1x00.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/pcmcia/au1000_xxs1500.c~remove-linux-versionh-includes drivers/pcmcia/au1000_xxs1500.c
--- devel/drivers/pcmcia/au1000_xxs1500.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/pcmcia/au1000_xxs1500.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/s390/net/claw.c~remove-linux-versionh-includes drivers/s390/net/claw.c
--- devel/drivers/s390/net/claw.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/s390/net/claw.c 2005-07-25 19:17:32.000000000 -0700
@@ -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"
diff -puN drivers/telephony/ixj.h~remove-linux-versionh-includes drivers/telephony/ixj.h
--- devel/drivers/telephony/ixj.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/telephony/ixj.h 2005-07-25 19:17:32.000000000 -0700
@@ -40,7 +40,6 @@
*****************************************************************************/
#define IXJ_VERSION 3031
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/ixjuser.h>
diff -puN drivers/usb/gadget/dummy_hcd.c~remove-linux-versionh-includes drivers/usb/gadget/dummy_hcd.c
--- devel/drivers/usb/gadget/dummy_hcd.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/gadget/dummy_hcd.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/usb/gadget/lh7a40x_udc.h~remove-linux-versionh-includes drivers/usb/gadget/lh7a40x_udc.h
--- devel/drivers/usb/gadget/lh7a40x_udc.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/gadget/lh7a40x_udc.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/usb/gadget/pxa2xx_udc.c~remove-linux-versionh-includes drivers/usb/gadget/pxa2xx_udc.c
--- devel/drivers/usb/gadget/pxa2xx_udc.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/gadget/pxa2xx_udc.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/usb/gadget/rndis.c~remove-linux-versionh-includes drivers/usb/gadget/rndis.c
--- devel/drivers/usb/gadget/rndis.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/gadget/rndis.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/usb/host/hc_crisv10.c~remove-linux-versionh-includes drivers/usb/host/hc_crisv10.c
--- devel/drivers/usb/host/hc_crisv10.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/host/hc_crisv10.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/usb/media/pwc/pwc-ctrl.c~remove-linux-versionh-includes drivers/usb/media/pwc/pwc-ctrl.c
--- devel/drivers/usb/media/pwc/pwc-ctrl.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/media/pwc/pwc-ctrl.c 2005-07-25 19:17:32.000000000 -0700
@@ -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;
diff -puN drivers/usb/media/pwc/pwc.h~remove-linux-versionh-includes drivers/usb/media/pwc/pwc.h
--- devel/drivers/usb/media/pwc/pwc.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/media/pwc/pwc.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/usb/media/pwc/pwc-if.c~remove-linux-versionh-includes drivers/usb/media/pwc/pwc-if.c
--- devel/drivers/usb/media/pwc/pwc-if.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/media/pwc/pwc-if.c 2005-07-25 19:17:32.000000000 -0700
@@ -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;
diff -puN drivers/usb/media/w9968cf.c~remove-linux-versionh-includes drivers/usb/media/w9968cf.c
--- devel/drivers/usb/media/w9968cf.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/media/w9968cf.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/usb/misc/sisusbvga/sisusb.c~remove-linux-versionh-includes drivers/usb/misc/sisusbvga/sisusb.c
--- devel/drivers/usb/misc/sisusbvga/sisusb.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/misc/sisusbvga/sisusb.c 2005-07-25 19:17:32.000000000 -0700
@@ -35,7 +35,6 @@
*/
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/signal.h>
diff -puN drivers/usb/misc/sisusbvga/sisusb.h~remove-linux-versionh-includes drivers/usb/misc/sisusbvga/sisusb.h
--- devel/drivers/usb/misc/sisusbvga/sisusb.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/usb/misc/sisusbvga/sisusb.h 2005-07-25 19:17:32.000000000 -0700
@@ -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 */
diff -puN drivers/video/backlight/backlight.c~remove-linux-versionh-includes drivers/video/backlight/backlight.c
--- devel/drivers/video/backlight/backlight.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/video/backlight/backlight.c 2005-07-25 19:17:32.000000000 -0700
@@ -5,7 +5,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h>
diff -puN drivers/video/backlight/lcd.c~remove-linux-versionh-includes drivers/video/backlight/lcd.c
--- devel/drivers/video/backlight/lcd.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/video/backlight/lcd.c 2005-07-25 19:17:32.000000000 -0700
@@ -5,7 +5,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h>
diff -puN drivers/video/intelfb/intelfbdrv.c~remove-linux-versionh-includes drivers/video/intelfb/intelfbdrv.c
--- devel/drivers/video/intelfb/intelfbdrv.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/video/intelfb/intelfbdrv.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN drivers/video/intelfb/intelfbhw.c~remove-linux-versionh-includes drivers/video/intelfb/intelfbhw.c
--- devel/drivers/video/intelfb/intelfbhw.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/drivers/video/intelfb/intelfbhw.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN fs/adfs/adfs.h~remove-linux-versionh-includes fs/adfs/adfs.h
--- devel/fs/adfs/adfs.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/adfs/adfs.h 2005-07-25 19:17:32.000000000 -0700
@@ -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;
diff -puN fs/hfs/hfs_fs.h~remove-linux-versionh-includes fs/hfs/hfs_fs.h
--- devel/fs/hfs/hfs_fs.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfs/hfs_fs.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN fs/hfs/inode.c~remove-linux-versionh-includes fs/hfs/inode.c
--- devel/fs/hfs/inode.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfs/inode.c 2005-07-25 19:17:32.000000000 -0700
@@ -12,7 +12,6 @@
*/
#include <linux/pagemap.h>
-#include <linux/version.h>
#include <linux/mpage.h>
#include "hfs_fs.h"
diff -puN fs/hfsplus/bnode.c~remove-linux-versionh-includes fs/hfsplus/bnode.c
--- devel/fs/hfsplus/bnode.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfsplus/bnode.c 2005-07-25 19:17:32.000000000 -0700
@@ -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"
diff -puN fs/hfsplus/dir.c~remove-linux-versionh-includes fs/hfsplus/dir.c
--- devel/fs/hfsplus/dir.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfsplus/dir.c 2005-07-25 19:17:32.000000000 -0700
@@ -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"
diff -puN fs/hfsplus/extents.c~remove-linux-versionh-includes fs/hfsplus/extents.c
--- devel/fs/hfsplus/extents.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfsplus/extents.c 2005-07-25 19:17:32.000000000 -0700
@@ -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"
diff -puN fs/hfsplus/hfsplus_fs.h~remove-linux-versionh-includes fs/hfsplus/hfsplus_fs.h
--- devel/fs/hfsplus/hfsplus_fs.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfsplus/hfsplus_fs.h 2005-07-25 19:17:32.000000000 -0700
@@ -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"
diff -puN fs/hfsplus/inode.c~remove-linux-versionh-includes fs/hfsplus/inode.c
--- devel/fs/hfsplus/inode.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfsplus/inode.c 2005-07-25 19:17:32.000000000 -0700
@@ -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"
diff -puN fs/hfsplus/super.c~remove-linux-versionh-includes fs/hfsplus/super.c
--- devel/fs/hfsplus/super.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfsplus/super.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN fs/hfsplus/wrapper.c~remove-linux-versionh-includes fs/hfsplus/wrapper.c
--- devel/fs/hfsplus/wrapper.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hfsplus/wrapper.c 2005-07-25 19:17:32.000000000 -0700
@@ -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"
diff -puN fs/hostfs/hostfs_kern.c~remove-linux-versionh-includes fs/hostfs/hostfs_kern.c
--- devel/fs/hostfs/hostfs_kern.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/hostfs/hostfs_kern.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN fs/xfs/linux-2.6/xfs_linux.h~remove-linux-versionh-includes fs/xfs/linux-2.6/xfs_linux.h
--- devel/fs/xfs/linux-2.6/xfs_linux.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/xfs/linux-2.6/xfs_linux.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN fs/xfs/xfs_dmapi.h~remove-linux-versionh-includes fs/xfs/xfs_dmapi.h
--- devel/fs/xfs/xfs_dmapi.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/fs/xfs/xfs_dmapi.h 2005-07-25 19:17:32.000000000 -0700
@@ -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
diff -puN include/linux/if_wanpipe_common.h~remove-linux-versionh-includes include/linux/if_wanpipe_common.h
--- devel/include/linux/if_wanpipe_common.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/linux/if_wanpipe_common.h 2005-07-25 19:17:32.000000000 -0700
@@ -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;
diff -puN include/linux/istallion.h~remove-linux-versionh-includes include/linux/istallion.h
--- devel/include/linux/istallion.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/linux/istallion.h 2005-07-25 19:17:32.000000000 -0700
@@ -21,8 +21,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/version.h>
-
/*****************************************************************************/
#ifndef _ISTALLION_H
#define _ISTALLION_H
diff -puN include/linux/mtd/cfi.h~remove-linux-versionh-includes include/linux/mtd/cfi.h
--- devel/include/linux/mtd/cfi.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/linux/mtd/cfi.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN include/linux/mtd/mtd.h~remove-linux-versionh-includes include/linux/mtd/mtd.h
--- devel/include/linux/mtd/mtd.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/linux/mtd/mtd.h 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN include/linux/phonedev.h~remove-linux-versionh-includes include/linux/phonedev.h
--- devel/include/linux/phonedev.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/linux/phonedev.h 2005-07-25 19:17:32.000000000 -0700
@@ -2,7 +2,6 @@
#define __LINUX_PHONEDEV_H
#include <linux/types.h>
-#include <linux/version.h>
#ifdef __KERNEL__
diff -puN include/linux/stallion.h~remove-linux-versionh-includes include/linux/stallion.h
--- devel/include/linux/stallion.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/linux/stallion.h 2005-07-25 19:17:32.000000000 -0700
@@ -21,8 +21,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/version.h>
-
/*****************************************************************************/
#ifndef _STALLION_H
#define _STALLION_H
diff -puN include/linux/videodev.h~remove-linux-versionh-includes include/linux/videodev.h
--- devel/include/linux/videodev.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/linux/videodev.h 2005-07-25 19:17:32.000000000 -0700
@@ -3,7 +3,6 @@
#include <linux/compiler.h>
#include <linux/types.h>
-#include <linux/version.h>
#define HAVE_V4L2 1
#include <linux/videodev2.h>
diff -puN include/media/ir-common.h~remove-linux-versionh-includes include/media/ir-common.h
--- devel/include/media/ir-common.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/media/ir-common.h 2005-07-25 19:17:32.000000000 -0700
@@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/version.h>
#include <linux/input.h>
diff -puN include/media/saa7146.h~remove-linux-versionh-includes include/media/saa7146.h
--- devel/include/media/saa7146.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/media/saa7146.h 2005-07-25 19:17:32.000000000 -0700
@@ -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; }
diff -puN include/sound/tea575x-tuner.h~remove-linux-versionh-includes include/sound/tea575x-tuner.h
--- devel/include/sound/tea575x-tuner.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/include/sound/tea575x-tuner.h 2005-07-25 19:17:32.000000000 -0700
@@ -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 */
diff -puN sound/mips/au1x00.c~remove-linux-versionh-includes sound/mips/au1x00.c
--- devel/sound/mips/au1x00.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/sound/mips/au1x00.c 2005-07-25 19:17:32.000000000 -0700
@@ -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;
diff -puN sound/oss/au1550_ac97.c~remove-linux-versionh-includes sound/oss/au1550_ac97.c
--- devel/sound/oss/au1550_ac97.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/sound/oss/au1550_ac97.c 2005-07-25 19:17:32.000000000 -0700
@@ -35,7 +35,6 @@
#undef DEBUG
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/ioport.h>
diff -puN sound/oss/msnd.c~remove-linux-versionh-includes sound/oss/msnd.c
--- devel/sound/oss/msnd.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/sound/oss/msnd.c 2005-07-25 19:17:32.000000000 -0700
@@ -24,7 +24,6 @@
*
********************************************************************/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
diff -puN sound/oss/os.h~remove-linux-versionh-includes sound/oss/os.h
--- devel/sound/oss/os.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/sound/oss/os.h 2005-07-25 19:17:32.000000000 -0700
@@ -5,7 +5,6 @@
#undef DO_TIMINGS
#include <linux/module.h>
-#include <linux/version.h>
#ifdef __KERNEL__
#include <linux/utsname.h>
diff -puN sound/oss/rme96xx.c~remove-linux-versionh-includes sound/oss/rme96xx.c
--- devel/sound/oss/rme96xx.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/sound/oss/rme96xx.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN sound/oss/sh_dac_audio.c~remove-linux-versionh-includes sound/oss/sh_dac_audio.c
--- devel/sound/oss/sh_dac_audio.c~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/sound/oss/sh_dac_audio.c 2005-07-25 19:17:32.000000000 -0700
@@ -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>
diff -puN sound/ppc/pmac.h~remove-linux-versionh-includes sound/ppc/pmac.h
--- devel/sound/ppc/pmac.h~remove-linux-versionh-includes 2005-07-25 19:17:32.000000000 -0700
+++ devel-akpm/sound/ppc/pmac.h 2005-07-25 19:17:32.000000000 -0700
@@ -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"
_