generic-2.6: sync patches to 2.6.33.1

[openwrt.git] / target / linux / coldfire / patches / 100-compile_fixes.patch

diff --git a/target/linux/coldfire/patches/100-compile_fixes.patch b/target/linux/coldfire/patches/100-compile_fixes.patch
index 7a579b3..0f0694e 100644 (file)
--- a/target/linux/coldfire/patches/100-compile_fixes.patch
+++ b/target/linux/coldfire/patches/100-compile_fixes.patch
@@ -9,18 +9,6 @@
  {
        pgd_val(*pgdp) = virt_to_phys(pmdp);
  }
---- a/include/asm-m68k/irq.h
-+++ b/include/asm-m68k/irq.h
-@@ -61,7 +61,8 @@
- 
- #define IRQ_USER      8
- 
--extern unsigned int irq_canonicalize(unsigned int irq);
-+//extern unsigned int irq_canonicalize(unsigned int irq);
-+#define irq_canonicalize(irq)  (irq)
- 
- struct pt_regs;
- 
 --- a/arch/m68k/mm/cf-mmu.c
 +++ b/arch/m68k/mm/cf-mmu.c
 @@ -21,6 +21,7 @@