[backfire] ar71xx: merge r28380

[openwrt-10.03/.git] / target / linux / rdc / patches-2.6.30 / 005-fix_amit_breakage.patch

diff --git a/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch b/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch
index 8103e841d527645e979766dd42320a3b12937f76..552e5f7eb9b95c37be676b513ca1a6886ce40c21 100644 (file)
--- a/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch
+++ b/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch
@@ -15,17 +15,17 @@
  
  #include "boot.h"
  #include <asm/segment.h>
-+#ifdef CONFIG_X86_RDC
-+#include <asm/mach-rdc/rdc321x_defs.h>
++#ifdef CONFIG_X86_RDC321X
++#include <asm/rdc321x_defs.h>
 +#endif
  
  /*
   * Invoke the realmode switch hook if present; otherwise
-@@ -156,6 +159,16 @@ void go_to_protected_mode(void)
+@@ -112,6 +115,16 @@ void go_to_protected_mode(void)
                die();
        }
  
-+#ifdef CONFIG_X86_RDC
++#ifdef CONFIG_X86_RDC321X
 +      {
 +              u32 bootctl;
 +