Fixes a regression on spi flash devices (upstream commit 1583eaece6fa). Changelogs: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10 096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied upstream and dropped. Signed-off-by: Mathias Kresin <openwrt@kresin.me> [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47104
		
			
				
	
	
		
			26 lines
		
	
	
		
			843 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			26 lines
		
	
	
		
			843 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
--- a/drivers/mtd/Kconfig
 | 
						|
+++ b/drivers/mtd/Kconfig
 | 
						|
@@ -179,6 +179,12 @@ config MTD_BCM47XX_PARTS
 | 
						|
 	  This provides partitions parser for devices based on BCM47xx
 | 
						|
 	  boards.
 | 
						|
 
 | 
						|
+config MTD_CYBERTAN_PARTS
 | 
						|
+	tristate "Cybertan partitioning support"
 | 
						|
+	depends on ATH79
 | 
						|
+	---help---
 | 
						|
+	   Cybertan partitioning support
 | 
						|
+
 | 
						|
 config MTD_MYLOADER_PARTS
 | 
						|
 	tristate "MyLoader partition parsing"
 | 
						|
 	depends on ADM5120 || ATH25 || ATH79
 | 
						|
--- a/drivers/mtd/Makefile
 | 
						|
+++ b/drivers/mtd/Makefile
 | 
						|
@@ -16,6 +16,7 @@ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
 | 
						|
 obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
 | 
						|
 obj-$(CONFIG_MTD_BCM47XX_PARTS)	+= bcm47xxpart.o
 | 
						|
 obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
 | 
						|
+obj-$(CONFIG_MTD_CYBERTAN_PARTS) += cybertan_part.o
 | 
						|
 
 | 
						|
 # 'Users' - code which presents functionality to userspace.
 | 
						|
 obj-$(CONFIG_MTD_BLKDEVS)	+= mtd_blkdevs.o
 |