X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Foxnas%2Fpatches-3.14%2F300-introduce-oxnas-platform.patch;h=9b6802d1b6839753e849ae8d2bd5ea66a2414880;hb=8a60d2a123bbac3fb02e202cec93067c23460412;hp=b6e2efb8519391d77e0b9907ceb29afd4d5227a6;hpb=eac9174b89e3790ac4238ce14723eb61130562f7;p=openwrt.git

diff --git a/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch b/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch
index b6e2efb851..9b6802d1b6 100644
--- a/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch
+++ b/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch
@@ -1,7 +1,5 @@
-Index: linux-3.14.18/arch/arm/Kconfig
-===================================================================
---- linux-3.14.18.orig/arch/arm/Kconfig
-+++ linux-3.14.18/arch/arm/Kconfig
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
 @@ -367,6 +367,17 @@ config ARCH_VERSATILE
  	help
  	  This enables support for ARM Ltd Versatile board.
@@ -29,10 +27,8 @@ Index: linux-3.14.18/arch/arm/Kconfig
  source "arch/arm/mach-picoxcell/Kconfig"
  
  source "arch/arm/mach-pxa/Kconfig"
-Index: linux-3.14.18/arch/arm/Makefile
-===================================================================
---- linux-3.14.18.orig/arch/arm/Makefile
-+++ linux-3.14.18/arch/arm/Makefile
+--- a/arch/arm/Makefile
++++ b/arch/arm/Makefile
 @@ -183,6 +183,7 @@ machine-$(CONFIG_ARCH_NSPIRE)		+= nspire
  machine-$(CONFIG_ARCH_OMAP1)		+= omap1
  machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
@@ -41,10 +37,8 @@ Index: linux-3.14.18/arch/arm/Makefile
  machine-$(CONFIG_ARCH_PICOXCELL)	+= picoxcell
  machine-$(CONFIG_ARCH_PXA)		+= pxa
  machine-$(CONFIG_ARCH_REALVIEW)		+= realview
-Index: linux-3.14.18/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-3.14.18.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.14.18/arch/arm/boot/dts/Makefile
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
 @@ -233,6 +233,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420
  	am43x-epos-evm.dtb \
  	dra7-evm.dtb
@@ -53,10 +47,8 @@ Index: linux-3.14.18/arch/arm/boot/dts/Makefile
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
  	ste-hrefprev60-stuib.dtb \
-Index: linux-3.14.18/arch/arm/tools/mach-types
-===================================================================
---- linux-3.14.18.orig/arch/arm/tools/mach-types
-+++ linux-3.14.18/arch/arm/tools/mach-types
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
 @@ -228,6 +228,7 @@ edb9302a		MACH_EDB9302A		EDB9302A		1127
  edb9307a		MACH_EDB9307A		EDB9307A		1128
  omap_3430sdp		MACH_OMAP_3430SDP	OMAP_3430SDP		1138
@@ -65,10 +57,8 @@ Index: linux-3.14.18/arch/arm/tools/mach-types
  micro9m			MACH_MICRO9M		MICRO9M			1169
  bug			MACH_BUG		BUG			1179
  at91sam9263ek		MACH_AT91SAM9263EK	AT91SAM9263EK		1202
-Index: linux-3.14.18/drivers/clk/Makefile
-===================================================================
---- linux-3.14.18.orig/drivers/clk/Makefile
-+++ linux-3.14.18/drivers/clk/Makefile
+--- a/drivers/clk/Makefile
++++ b/drivers/clk/Makefile
 @@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_LOONGSON1)		+= clk-ls1
  obj-$(CONFIG_COMMON_CLK_MAX77686)	+= clk-max77686.o
  obj-$(CONFIG_ARCH_NOMADIK)		+= clk-nomadik.o