Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

4 files changed, 7 insertions, 6 deletions

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 191b85e857e0..f1a0a00b3b07 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -394,6 +394,7 @@ config ATM_HE_USE_SUNI
 config ATM_SOLOS
         tristate "Solos ADSL2+ PCI Multiport card driver"
         depends on PCI
+        select FW_LOADER
         help
           Support for the Solos multiport ADSL2+ card.
 
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index b86712167eb8..b9101818b47b 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -68,7 +68,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type,
         *(struct atm_vcc **) &new_msg->vcc = vcc;
         old_test = test_bit(flag,&vcc->flags);
         out_vcc->push(out_vcc,skb);
-        add_wait_queue(sk_atm(vcc)->sk_sleep, &wait);
+        add_wait_queue(sk_sleep(sk_atm(vcc)), &wait);
         while (test_bit(flag,&vcc->flags) == old_test) {
                 mb();
                 out_vcc = PRIV(vcc->dev) ? PRIV(vcc->dev)->vcc : NULL;
@@ -80,7 +80,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type,
                 schedule();
         }
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(sk_atm(vcc)->sk_sleep, &wait);
+        remove_wait_queue(sk_sleep(sk_atm(vcc)), &wait);
         return error;
 }
 
@@ -105,7 +105,7 @@ static int atmtcp_recv_control(const struct atmtcp_control *msg)
                     msg->type);
                 return -EINVAL;
         }
-        wake_up(sk_atm(vcc)->sk_sleep);
+        wake_up(sk_sleep(sk_atm(vcc)));
         return 0;
 }
 
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 719ec5a0dca5..90a5a7cac740 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1131,7 +1131,7 @@ DPRINTK("doing direct send\n"); /* @@@ well, this doesn't work anyway */
                         if (i == -1)
                                 put_dma(tx->index,eni_dev->dma,&j,(unsigned long)
                                     skb->data,
-                                    skb->len - skb->data_len);
+                                    skb_headlen(skb));
                         else
                                 put_dma(tx->index,eni_dev->dma,&j,(unsigned long)
                                     skb_shinfo(skb)->frags[i].page + skb_shinfo(skb)->frags[i].page_offset,
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index c213e0da0343..56c2e99e458f 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -2664,8 +2664,8 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
 
 #ifdef USE_SCATTERGATHER
         tpd->iovec[slot].addr = pci_map_single(he_dev->pci_dev, skb->data,
-                                skb->len - skb->data_len, PCI_DMA_TODEVICE);
-        tpd->iovec[slot].len = skb->len - skb->data_len;
+                                skb_headlen(skb), PCI_DMA_TODEVICE);
+        tpd->iovec[slot].len = skb_headlen(skb);
         ++slot;
 
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {