Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c

3 files changed, 12 insertions, 18 deletions

diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index cc70d53fadd3..04d7a251e3f0 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -122,7 +122,7 @@ static inline void if_cs_write16(struct if_cs_card *card, uint reg, u16 val)
 static inline void if_cs_write16_rep(
         struct if_cs_card *card,
         uint reg,
-        void *buf,
+        const void *buf,
         unsigned long count)
 {
         if (debug_output)
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 51f664bbee9d..b54e2ea8346b 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/net/wireless/libertas/if_sdio.c
  *
- *  Copyright 2007 Pierre Ossman
+ *  Copyright 2007-2008 Pierre Ossman
  *
  * Inspired by if_cs.c, Copyright 2007 Holger Schurig
  *
@@ -266,13 +266,10 @@ static int if_sdio_card_to_host(struct if_sdio_card *card)
 
         /*
          * The transfer must be in one transaction or the firmware
-         * goes suicidal.
+         * goes suicidal. There's no way to guarantee that for all
+         * controllers, but we can at least try.
          */
-        chunk = size;
-        if ((chunk > card->func->cur_blksize) || (chunk > 512)) {
-                chunk = (chunk + card->func->cur_blksize - 1) /
-                        card->func->cur_blksize * card->func->cur_blksize;
-        }
+        chunk = sdio_align_size(card->func, size);
 
         ret = sdio_readsb(card->func, card->buffer, card->ioport, chunk);
         if (ret)
@@ -392,7 +389,7 @@ static int if_sdio_prog_helper(struct if_sdio_card *card)
         unsigned long timeout;
         u8 *chunk_buffer;
         u32 chunk_size;
-        u8 *firmware;
+        const u8 *firmware;
         size_t size;
 
         lbs_deb_enter(LBS_DEB_SDIO);
@@ -508,7 +505,7 @@ static int if_sdio_prog_real(struct if_sdio_card *card)
         unsigned long timeout;
         u8 *chunk_buffer;
         u32 chunk_size;
-        u8 *firmware;
+        const u8 *firmware;
         size_t size, req_size;
 
         lbs_deb_enter(LBS_DEB_SDIO);
@@ -696,13 +693,10 @@ static int if_sdio_host_to_card(struct lbs_private *priv,
 
         /*
          * The transfer must be in one transaction or the firmware
-         * goes suicidal.
+         * goes suicidal. There's no way to guarantee that for all
+         * controllers, but we can at least try.
          */
-        size = nb + 4;
-        if ((size > card->func->cur_blksize) || (size > 512)) {
-                size = (size + card->func->cur_blksize - 1) /
-                        card->func->cur_blksize * card->func->cur_blksize;
-        }
+        size = sdio_align_size(card->func, nb + 4);
 
         packet = kzalloc(sizeof(struct if_sdio_packet) + size,
                         GFP_ATOMIC);
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index a8b4abce5bfa..632c291404ab 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -310,7 +310,7 @@ static void if_usb_disconnect(struct usb_interface *intf)
 static int if_usb_send_fw_pkt(struct if_usb_card *cardp)
 {
         struct fwdata *fwdata = cardp->ep_out_buf;
-        uint8_t *firmware = cardp->fw->data;
+        const uint8_t *firmware = cardp->fw->data;
 
         /* If we got a CRC failure on the last block, back
            up and retry it */
@@ -768,7 +768,7 @@ static int if_usb_issue_boot_command(struct if_usb_card *cardp, int ivalue)
  *         len               image length
  *  @return     0 or -1
  */
-static int check_fwfile_format(uint8_t *data, uint32_t totlen)
+static int check_fwfile_format(const uint8_t *data, uint32_t totlen)
 {
         uint32_t bincmd, exit;
         uint32_t blksize, offset, len;