projects
/
openwrt
/
staging
/
dedeckeh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
19b0e56
)
move inclusion of the mach-ar71xx/Kconfig into the right patch
author
Gabor Juhos
<juhosg@openwrt.org>
Thu, 16 Oct 2008 13:33:33 +0000
(13:33 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Thu, 16 Oct 2008 13:33:33 +0000
(13:33 +0000)
SVN-Revision: 12988
target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch
patch
|
blob
|
history
diff --git
a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
index cd537eb0cac4ee6d7ab1217b31cd8d5d3ec6f790..ebf8d60394642463642ed0e48718918f44456c09 100644
(file)
--- a/
target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
+++ b/
target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
@@
-60,3
+60,11
@@
config BASLER_EXCITE
bool "Basler eXcite smart camera"
select CEVT_R4K
config BASLER_EXCITE
bool "Basler eXcite smart camera"
select CEVT_R4K
+@@ -687,6 +705,7 @@
+
+ endchoice
+
++source "arch/mips/ar71xx/Kconfig"
+ source "arch/mips/au1000/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
+ source "arch/mips/jazz/Kconfig"
diff --git
a/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
b/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
index 4ab8b75213dad7837e267967cdabaea4cb7639fe..e8af1eeb879a03d380e10f5dbc6e60cb44b79ada 100644
(file)
--- a/
target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
+++ b/
target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
@@
-10,7
+10,7
@@
libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -87
3,6 +873
,9 @@
+@@ -87
4,6 +874
,9 @@
config MIPS_DISABLE_OBSOLETE_IDE
bool
config MIPS_DISABLE_OBSOLETE_IDE
bool
diff --git
a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
index a1e82808c7689747636a78658da65e42626746f8..755b920e411cf6fcf1809a87b5bd17283befbb70 100644
(file)
--- a/
target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
+++ b/
target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
@@
-123,15
+123,7
@@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -705,6 +705,7 @@
-
- endchoice
-
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/au1000/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/jazz/Kconfig"
-@@ -879,6 +880,9 @@
+@@ -880,6 +880,9 @@
config SYNC_R4K
bool
config SYNC_R4K
bool
diff --git
a/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch
b/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch
index f37b4d0b16869d0a19efabbbaaffc869bc0c7db9..5db99d6a82c94845704bdc9ba720f4329eea42cb 100644
(file)
--- a/
target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch
+++ b/
target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch
@@
-59,3
+59,11
@@
config BASLER_EXCITE
bool "Basler eXcite smart camera"
select CEVT_R4K
config BASLER_EXCITE
bool "Basler eXcite smart camera"
select CEVT_R4K
+@@ -598,6 +615,7 @@ config WR_PPMC
+
+ endchoice
+
++source "arch/mips/ar71xx/Kconfig"
+ source "arch/mips/au1000/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
+ source "arch/mips/jazz/Kconfig"
diff --git
a/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch
b/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch
index 974ca0ed723c5b5c42192963e017c51e576965b8..fdd48686c64f841310c175615ccb29e72fa33fc1 100644
(file)
--- a/
target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch
+++ b/
target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch
@@
-10,7
+10,7
@@
libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -78
2,6 +782
,9 @@ config MIPS_NILE4
+@@ -78
3,6 +783
,9 @@ config MIPS_NILE4
config MIPS_DISABLE_OBSOLETE_IDE
bool
config MIPS_DISABLE_OBSOLETE_IDE
bool
diff --git
a/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch
b/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch
index bedc45f53046828897bd28de88600467a30e3a19..dced430213090bdb37bfbca95acb4fc08980a31f 100644
(file)
--- a/
target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch
+++ b/
target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch
@@
-123,15
+123,7
@@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -615,6 +615,7 @@ config WR_PPMC
-
- endchoice
-
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/au1000/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/jazz/Kconfig"
-@@ -788,6 +789,9 @@ config MYLOADER
+@@ -789,6 +789,9 @@ config MYLOADER
config SYNC_R4K
bool
config SYNC_R4K
bool