[linux] 01/01: [mips*/octeon] Drop obsolete patch adding support for the UBNT E200 board.

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch sid
in repository linux.

commit f2b1e81469e930deae33c3121ad0baa47e103bf2
Author: Aurelien Jarno <aurelien at aurel32.net>
Date:   Fri Apr 21 11:31:33 2017 +0200

    [mips*/octeon] Drop obsolete patch adding support for the UBNT E200 board.
---
 debian/changelog                                   |  4 ++
 ...cteon-Add-support-for-the-UBNT-E200-board.patch | 52 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4a26de..433651e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -256,6 +256,10 @@ linux (4.9.22-1) UNRELEASED; urgency=medium
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
 
+  [ Aurelien Jarno ]
+  * [mips*/octeon] Drop obsolete patch adding support for the UBNT E200
+    board.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 30 Mar 2017 18:27:30 +0100
 
 linux (4.9.18-1) unstable; urgency=medium
diff --git a/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch b/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
deleted file mode 100644
index 59d9e82..0000000
--- a/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Markos Chandras <markos.chandras at imgtec.com>
-Date: Fri, 28 Mar 2014 17:22:52 +0000
-Subject: [PATCH 01/12] MIPS: octeon: Add support for the UBNT E200 board
-Origin: https://www.linux-mips.org/archives/linux-mips/2014-11/msg00566.html
-
-Add support for the UBNT E200 board (EdgeRouter/EdgeRouter Pro 8 port).
-
-Signed-off-by: Markos Chandras <markos.chandras at imgtec.com>
-[bwh: Forward-ported to 3.17: adjust context]
----
- arch/mips/cavium-octeon/executive/cvmx-helper-board.c | 3 +++
- arch/mips/include/asm/octeon/cvmx-bootinfo.h          | 2 ++
- arch/mips/include/asm/octeon/octeon-model.h           | 3 +++
- 3 files changed, 8 insertions(+)
-
---- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
-+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
-@@ -186,6 +186,8 @@ int cvmx_helper_board_get_mii_address(in
- 			return 7 - ipd_port;
- 		else
- 			return -1;
-+	case CVMX_BOARD_TYPE_UBNT_E200:
-+		return -1;
- 	case CVMX_BOARD_TYPE_KONTRON_S1901:
- 		if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)
- 			return 1;
-@@ -744,6 +746,7 @@ enum cvmx_helper_board_usb_clock_types _
- 	case CVMX_BOARD_TYPE_LANAI2_G:
- 	case CVMX_BOARD_TYPE_NIC10E_66:
- 	case CVMX_BOARD_TYPE_UBNT_E100:
-+	case CVMX_BOARD_TYPE_UBNT_E200:
- 		return USB_CLOCK_TYPE_CRYSTAL_12;
- 	case CVMX_BOARD_TYPE_NIC10E:
- 		return USB_CLOCK_TYPE_REF_12;
---- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
-+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
-@@ -295,6 +295,7 @@ enum cvmx_board_types_enum {
- 	 */
- 	CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
- 	CVMX_BOARD_TYPE_UBNT_E100 = 20002,
-+	CVMX_BOARD_TYPE_UBNT_E200 = 20003,
- 	CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
- 	CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
- 	CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
-@@ -396,6 +397,7 @@ static inline const char *cvmx_board_typ
- 		    /* Customer private range */
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
-+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
diff --git a/debian/patches/series b/debian/patches/series
index bcee17e..f5899de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -60,7 +60,6 @@ bugfix/arm64/rtc-tegra-implement-clock-handling.patch
 # Arch features
 features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
 features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
-features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
 features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
 features/x86/x86-make-x32-syscall-support-conditional.patch
 features/arm/arm-dts-add-support-for-turris-omnia.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git