X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fatm%2Fhorizon.c;h=d1113e845f953bc6dc963215a5b9f37936062651;hb=05668381140309088443bf5dc53add4104610fbb;hp=0cded04680033a95c1cd93ad9ce771d7112651e1;hpb=e3ee3b78f83688a0ae4315e8be71b2eac559904a;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 0cded046800..d1113e845f9 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -1511,8 +1511,8 @@ static inline short setup_idle_tx_channel (hrz_dev * dev, hrz_vcc * vcc) {
     // a.k.a. prepare the channel and remember that we have done so.
     
     tx_ch_desc * tx_desc = &memmap->tx_descs[tx_channel];
-    u16 rd_ptr;
-    u16 wr_ptr;
+    u32 rd_ptr;
+    u32 wr_ptr;
     u16 channel = vcc->channel;
     
     unsigned long flags;
@@ -2735,7 +2735,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
 	irq = pci_dev->irq;
 	if (request_irq(irq,
 			interrupt_handler,
-			SA_SHIRQ, /* irqflags guess */
+			IRQF_SHARED, /* irqflags guess */
 			DEV_LABEL, /* name guess */
 			dev)) {
 		PRINTD(DBG_WARN, "request IRQ failed!");