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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 28b6ff3eaa37..bd35bb0a1480 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -559,7 +559,7 @@ static const struct {
 static void build_wpa_mib(struct atmel_private *priv);
 static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static void atmel_copy_to_card(struct net_device *dev, u16 dest,
-                               unsigned char *src, u16 len);
+                               const unsigned char *src, u16 len);
 static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest,
                                u16 src, u16 len);
 static void atmel_set_gcr(struct net_device *dev, u16 mask);
@@ -3855,7 +3855,7 @@ static int reset_atmel_card(struct net_device *dev)
         if (priv->card_type == CARD_TYPE_EEPROM) {
                 /* copy in firmware if needed */
                 const struct firmware *fw_entry = NULL;
-                unsigned char *fw;
+                const unsigned char *fw;
                 int len = priv->firmware_length;
                 if (!(fw = priv->firmware)) {
                         if (priv->firmware_type == ATMEL_FW_TYPE_NONE) {
@@ -4122,7 +4122,7 @@ static void atmel_writeAR(struct net_device *dev, u16 data)
 }
 
 static void atmel_copy_to_card(struct net_device *dev, u16 dest,
-                               unsigned char *src, u16 len)
+                               const unsigned char *src, u16 len)
 {
         int i;
         atmel_writeAR(dev, dest);