Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-netx / xc.c

diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c
index 32eabf5dfa4fcd736ec332087963b6a1be6552eb..181a78ba81654bdae53bda56c7ede38faad6063b 100644 (file)
--- a/arch/arm/mach-netx/xc.c
+++ b/arch/arm/mach-netx/xc.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 
 #include <mach/hardware.h>
+#include <mach/irqs.h>
 #include <mach/netx-regs.h>
 
 #include <mach/xc.h>
@@ -92,10 +93,10 @@ static int xc_check_ptr(struct xc *x, unsigned long adr, unsigned int size)
        return -1;
 }
 
-static int xc_patch(struct xc *x, void *patch, int count)
+static int xc_patch(struct xc *x, const void *patch, int count)
 {
        unsigned int val, adr;
-       unsigned int *data = patch;
+       const unsigned int *data = patch;
 
        int i;
        for (i = 0; i < count; i++) {
@@ -117,7 +118,7 @@ int xc_request_firmware(struct xc *x)
        struct fw_header *head;
        unsigned int size;
        int i;
-       void *src;
+       const void *src;
        unsigned long dst;
 
        sprintf(name, "xc%d.bin", x->no);