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, 5 insertions, 5 deletions

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index ef73e72daedc..6bff9d87dc57 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4668,7 +4668,7 @@ static inline int __devinit cyc_isfwstr(const char *str, unsigned int size)
         return 0;
 }
 
-static inline void __devinit cyz_fpga_copy(void __iomem *fpga, u8 *data,
+static inline void __devinit cyz_fpga_copy(void __iomem *fpga, const u8 *data,
                 unsigned int size)
 {
         for (; size > 0; size--) {
@@ -4701,10 +4701,10 @@ static int __devinit __cyz_load_fw(const struct firmware *fw,
                 const char *name, const u32 mailbox, void __iomem *base,
                 void __iomem *fpga)
 {
-        void *ptr = fw->data;
-        struct zfile_header *h = ptr;
-        struct zfile_config *c, *cs;
-        struct zfile_block *b, *bs;
+        const void *ptr = fw->data;
+        const struct zfile_header *h = ptr;
+        const struct zfile_config *c, *cs;
+        const struct zfile_block *b, *bs;
         unsigned int a, tmp, len = fw->size;
 #define BAD_FW KERN_ERR "Bad firmware: "
         if (len < sizeof(*h)) {