diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2009-06-14 11:29:41 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2009-06-14 11:29:41 +0000 |
commit | b744dced08f3c1f114b8fb34bf708a549cfc1684 (patch) | |
tree | 168642afca879fc7184dfd77b3b9d11d19e889e7 | |
parent | af0d813825c2396e947b8dbefedcb604c522f53f (diff) | |
download | master-31e0f0ae-b744dced08f3c1f114b8fb34bf708a549cfc1684.tar.gz master-31e0f0ae-b744dced08f3c1f114b8fb34bf708a549cfc1684.tar.bz2 master-31e0f0ae-b744dced08f3c1f114b8fb34bf708a549cfc1684.zip |
refresh 2.6.30 patches
SVN-Revision: 16446
-rw-r--r-- | target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch | 4 | ||||
-rw-r--r-- | target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch index 40fcd51894..b67af11a44 100644 --- a/target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -610,6 +610,13 @@ else +@@ -603,6 +603,13 @@ else load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 endif @@ -40,7 +40,7 @@ config BASLER_EXCITE bool "Basler eXcite smart camera" select CEVT_R4K -@@ -633,6 +650,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD +@@ -634,6 +651,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD endchoice source "arch/mips/alchemy/Kconfig" diff --git a/target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch index cbe4d68251..bd5ff9bf6a 100644 --- a/target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -172,6 +172,7 @@ endif +@@ -165,6 +165,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ @@ -10,7 +10,7 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -817,6 +817,9 @@ config MIPS_NILE4 +@@ -818,6 +818,9 @@ config MIPS_NILE4 config MIPS_DISABLE_OBSOLETE_IDE bool |