Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[deliverable/linux.git] / drivers / isdn / hisax / nj_s.c

diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index fa2db87667c8367f3100d7e071b1a010895ff17e..a895dfed40e5fdcdc19d6e30e3fadcf4fb0d8dda 100644 (file)
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -151,7 +151,7 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
                                   struct IsdnCardState *cs)
 {
-       int cfg;
+       u32 cfg;
 
        if (pci_enable_device(dev_netjet))
                return(0);