Karsten,

As I mentioned in previous emails, I would like to send these upstream
for 2.6.24.  These are the first step in converting the hisax driver
over to the modular, hotplug-friendly ISA/PNP/PCI APIs.

The second step in that conversion is 95% complete (one more driver),
and is stored in branch 'isdn-pci' of the repository below.

The changes below were posted as patches many weeks ago, without
comment.  I also propagated these to the 'ALL' branch that gets copied
into -mm for testing, though some changes have been there longer than
others.

All these changes are code movement changes, without any changes to the
logic -- even the existing whitespace funnies were kept in many cases.

Would you mind pulling these, or permitting me to push them upstream?

Thanks,

	Jeff




The 'isdn-cleanups' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git isdn-cleanups

contains the following changes:

Jeff Garzik (5):
      [ISDN] Remove CONFIG_PCI ifdefs from 100% PCI source code
      [ISDN] HiSax avm_pci: split setup into three smaller functions
      [ISDN] HiSax elsa: split huge setup function into four smaller functions
      [ISDN] HiSax sedlbauer: move ISAPNP and PCI code into functions of their own
      [ISDN] HiSax diva: split setup into three smaller functions

 drivers/isdn/hisax/avm_pci.c   |  224 ++++++++++-------
 drivers/isdn/hisax/bkm_a8.c    |    8 
 drivers/isdn/hisax/diva.c      |  513 +++++++++++++++++++++++------------------
 drivers/isdn/hisax/elsa.c      |  494 ++++++++++++++++++++++-----------------
 drivers/isdn/hisax/sedlbauer.c |  276 ++++++++++++----------
 drivers/isdn/hisax/telespci.c  |    8 
 drivers/isdn/hisax/w6692.c     |    7 
 7 files changed, 868 insertions(+), 662 deletions(-)

diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index b04a178..f8b7978 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -20,7 +20,6 @@
 #include <linux/isapnp.h>
 ...
[ message continues ]

Tested and Acked.

-- 
Karsten Keil
SuSE Labs
ISDN and VOIP development
SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)
-

[ message continues ]

Thanks (for this, and hysdn)

	Jeff



-

[ message continues ]