refresh 2.6.30 patches
SVN-Revision: 16446
This commit is contained in:
parent
af0d813825
commit
b744dced08
2 changed files with 4 additions and 4 deletions
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/Makefile
|
--- a/arch/mips/Makefile
|
||||||
+++ b/arch/mips/Makefile
|
+++ b/arch/mips/Makefile
|
||||||
@@ -610,6 +610,13 @@ else
|
@@ -603,6 +603,13 @@ else
|
||||||
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
|
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
config BASLER_EXCITE
|
config BASLER_EXCITE
|
||||||
bool "Basler eXcite smart camera"
|
bool "Basler eXcite smart camera"
|
||||||
select CEVT_R4K
|
select CEVT_R4K
|
||||||
@@ -633,6 +650,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
@@ -634,6 +651,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
source "arch/mips/alchemy/Kconfig"
|
source "arch/mips/alchemy/Kconfig"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/Makefile
|
--- a/arch/mips/Makefile
|
||||||
+++ b/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_ARC) += arch/mips/fw/arc/
|
||||||
libs-$(CONFIG_CFE) += arch/mips/fw/cfe/
|
libs-$(CONFIG_CFE) += arch/mips/fw/cfe/
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/
|
libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/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
|
config MIPS_DISABLE_OBSOLETE_IDE
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue