ChangeSet@1.1382, 2003-09-28 11:43:45-07:00, torvalds@home.osdl.org Merge bk://kernel.bkbits.net/jgarzik/misc-2.5 into home.osdl.org:/home/torvalds/v2.5/linux ChangeSet@1.1375.2.3, 2003-09-28 10:31:20-04:00, mzyngier@freesurf.fr [PATCH] ne3210 update The enclosed patch ports the ne3210 driver over the EISA probing API. It also fixes some ioremap/isa_memcopy_fromio problems (depending on where the card memory was mapped) by using ioremap unconditionally and letting memcopy_fromio do the right thing. Finally, it removes the card from Space.c (warning, potential interface renumbering !). The module options are currently disabled, until Rusty's module_param_array() patch is included. I will re-introduce them ASAP. Quite heavily tested on x86. ChangeSet@1.1375.2.2, 2003-09-28 10:31:04-04:00, shemminger@osdl.org [PATCH] Fix warnings in hamradio/baycom build Sorry, overlooked the corresponding .h file in that patch, here it is. ChangeSet@1.1375.2.1, 2003-09-28 10:30:55-04:00, romieu@fr.zoreil.com [PATCH] Fix debug statement after return in drivers/net/wireless/arlan-main.c This patch applies to 2.5.68 and is listed on kbugs.org. The debug statement is never executed because it is after a return. ChangeSet@1.1381, 2003-09-28 01:10:28-04:00, jgarzik@redhat.com [BK] "bk ignore" aic7xxx auto-generated files ChangeSet@1.1375.1.1, 2003-09-28 00:24:59-04:00, jgarzik@redhat.com [janitor] Replace bcopy() uses with memcpy(), where possible. Affects: JFS, scsi/{sym,sym2}, arch/ia64/sn/io/sn2/{module,pic}.c ChangeSet@1.1380, 2003-09-28 00:17:50-04:00, jgarzik@redhat.com Misc warning fixes: * block/cciss: eliminate "comparison always false" warning * char/agp/amd64-agp: properly suffix 64-bit constants * ide/legacy/pdc4030: fix incomplete conversion to new IDE module API ChangeSet@1.1379, 2003-09-28 00:15:50-04:00, jgarzik@redhat.com [wireless arlan] fix modular build 'probe' module parameter is only used when arlan is built as a module. ChangeSet@1.1378, 2003-09-28 00:15:00-04:00, jgarzik@redhat.com [MCA] don't include linux/mca-legacy.h from linux/mca.h. As the functions and definitions in linux/mca-legacy.h are deprecated, require that users explicitly include linux/mca-legacy.h as needed. Prior to this change, _all_ users of linux/mca.h (i.e. proper users) issued a warning at compile time, when the MCA legacy API was enabled. Now only actual users of the legacy API cause warnings, not all MCA drivers. ChangeSet@1.1377, 2003-09-28 00:12:42-04:00, jgarzik@redhat.com [MCA] convert mca-proc to use not-deprecated functions ChangeSet@1.1376, 2003-09-28 00:12:06-04:00, jgarzik@redhat.com [MCA] include linux/mca-legacy.h directly, to access deprecated MCA API ChangeSet@1.1375, 2003-09-27 17:46:14-07:00, torvalds@home.osdl.org Linux 2.6.0-test6 TAG: v2.6.0-test6