resync patches
SVN-Revision: 11814
This commit is contained in:
parent
60d697e3bc
commit
7292c47b22
5 changed files with 17 additions and 17 deletions
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/char/random.c
|
--- a/drivers/char/random.c
|
||||||
+++ b/drivers/char/random.c
|
+++ b/drivers/char/random.c
|
||||||
@@ -248,9 +248,9 @@
|
@@ -258,9 +258,9 @@
|
||||||
/*
|
/*
|
||||||
* Configuration information
|
* Configuration information
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
--- a/arch/arm/mach-ixp4xx/Kconfig
|
--- a/arch/arm/mach-ixp4xx/Kconfig
|
||||||
+++ b/arch/arm/mach-ixp4xx/Kconfig
|
+++ b/arch/arm/mach-ixp4xx/Kconfig
|
||||||
@@ -81,6 +81,14 @@
|
@@ -89,6 +89,14 @@
|
||||||
config MACH_PRONGHORNMETRO
|
Engineering Sidewinder board. For more information on this
|
||||||
def_bool MACH_PRONGHORN
|
platform, see http://www.adiengineering.com
|
||||||
|
|
||||||
+config MACH_COMPEX
|
+config MACH_COMPEX
|
||||||
+ bool "Compex WP18 / NP18A"
|
+ bool "Compex WP18 / NP18A"
|
||||||
|
@ -17,18 +17,18 @@
|
||||||
help
|
help
|
||||||
--- a/arch/arm/mach-ixp4xx/Makefile
|
--- a/arch/arm/mach-ixp4xx/Makefile
|
||||||
+++ b/arch/arm/mach-ixp4xx/Makefile
|
+++ b/arch/arm/mach-ixp4xx/Makefile
|
||||||
@@ -18,6 +18,7 @@
|
@@ -19,6 +19,7 @@
|
||||||
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
|
|
||||||
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
||||||
obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o
|
obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o
|
||||||
|
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
|
||||||
+obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
+obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
||||||
|
|
||||||
obj-y += common.o
|
obj-y += common.o
|
||||||
|
|
||||||
@@ -34,6 +35,7 @@
|
@@ -36,6 +37,7 @@
|
||||||
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
|
|
||||||
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
||||||
obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o
|
obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o
|
||||||
|
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
|
||||||
+obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
+obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
||||||
|
|
||||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/arm/mach-ixp4xx/Kconfig
|
--- a/arch/arm/mach-ixp4xx/Kconfig
|
||||||
+++ b/arch/arm/mach-ixp4xx/Kconfig
|
+++ b/arch/arm/mach-ixp4xx/Kconfig
|
||||||
@@ -89,6 +89,14 @@
|
@@ -97,6 +97,14 @@
|
||||||
WP18 or NP18A boards. For more information on this
|
WP18 or NP18A boards. For more information on this
|
||||||
platform, see http://openwrt.org
|
platform, see http://openwrt.org
|
||||||
|
|
||||||
|
@ -17,17 +17,17 @@
|
||||||
help
|
help
|
||||||
--- a/arch/arm/mach-ixp4xx/Makefile
|
--- a/arch/arm/mach-ixp4xx/Makefile
|
||||||
+++ b/arch/arm/mach-ixp4xx/Makefile
|
+++ b/arch/arm/mach-ixp4xx/Makefile
|
||||||
@@ -19,6 +19,7 @@
|
@@ -20,6 +20,7 @@
|
||||||
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
|
||||||
obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o
|
obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o
|
||||||
|
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
|
||||||
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
||||||
+obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
+obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
||||||
|
|
||||||
obj-y += common.o
|
obj-y += common.o
|
||||||
|
|
||||||
@@ -36,6 +37,7 @@
|
@@ -38,6 +39,7 @@
|
||||||
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
|
||||||
obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o
|
obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o
|
||||||
|
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
|
||||||
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
||||||
+obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
+obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
||||||
|
|
||||||
|
|
|
@ -184,17 +184,17 @@
|
||||||
--- a/arch/arm/mach-ixp4xx/Makefile
|
--- a/arch/arm/mach-ixp4xx/Makefile
|
||||||
+++ b/arch/arm/mach-ixp4xx/Makefile
|
+++ b/arch/arm/mach-ixp4xx/Makefile
|
||||||
@@ -21,6 +21,7 @@
|
@@ -21,6 +21,7 @@
|
||||||
|
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
|
||||||
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
||||||
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
||||||
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
|
|
||||||
+obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
|
+obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
|
||||||
|
|
||||||
obj-y += common.o
|
obj-y += common.o
|
||||||
|
|
||||||
@@ -40,6 +41,7 @@
|
@@ -40,6 +41,7 @@
|
||||||
|
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
|
||||||
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
||||||
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
||||||
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
|
|
||||||
+obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
|
+obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
|
||||||
|
|
||||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||||
|
|
|
@ -18,16 +18,16 @@
|
||||||
--- a/arch/arm/mach-ixp4xx/Makefile
|
--- a/arch/arm/mach-ixp4xx/Makefile
|
||||||
+++ b/arch/arm/mach-ixp4xx/Makefile
|
+++ b/arch/arm/mach-ixp4xx/Makefile
|
||||||
@@ -22,6 +22,7 @@
|
@@ -22,6 +22,7 @@
|
||||||
|
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
||||||
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
||||||
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
|
|
||||||
obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
|
obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
|
||||||
+obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o
|
+obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o
|
||||||
|
|
||||||
obj-y += common.o
|
obj-y += common.o
|
||||||
|
|
||||||
@@ -42,6 +43,7 @@
|
@@ -42,6 +43,7 @@
|
||||||
|
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
||||||
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
||||||
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
|
|
||||||
obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
|
obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
|
||||||
+obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o
|
+obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue