diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
| commit | 9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch) | |
| tree | c76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/octeon | |
| parent | 3951f9492f31b59602a9a7c46fbb041be0929be0 (diff) | |
| download | master-31e0f0ae-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz master-31e0f0ae-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2 master-31e0f0ae-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip | |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43564
Diffstat (limited to 'target/linux/octeon')
| -rw-r--r-- | target/linux/octeon/patches-3.14/0010-MIPS-octeon-Add-interface-mode-detection-for-Octeon-.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/octeon/patches-3.14/0010-MIPS-octeon-Add-interface-mode-detection-for-Octeon-.patch b/target/linux/octeon/patches-3.14/0010-MIPS-octeon-Add-interface-mode-detection-for-Octeon-.patch index 2002dd1d76..0678df29e7 100644 --- a/target/linux/octeon/patches-3.14/0010-MIPS-octeon-Add-interface-mode-detection-for-Octeon-.patch +++ b/target/linux/octeon/patches-3.14/0010-MIPS-octeon-Add-interface-mode-detection-for-Octeon-.patch @@ -20,8 +20,8 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- a/arch/mips/cavium-octeon/executive/cvmx-helper.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c -@@ -104,6 +104,158 @@ int cvmx_helper_ports_on_interface(int i - } +@@ -106,6 +106,158 @@ int cvmx_helper_ports_on_interface(int i + EXPORT_SYMBOL_GPL(cvmx_helper_ports_on_interface); /** + * @INTERNAL @@ -179,7 +179,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> * Get the operating mode of an interface. Depending on the Octeon * chip and configuration, this function returns an enumeration * of the type of packet I/O supported by an interface. -@@ -116,6 +268,20 @@ int cvmx_helper_ports_on_interface(int i +@@ -118,6 +270,20 @@ EXPORT_SYMBOL_GPL(cvmx_helper_ports_on_i cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int interface) { union cvmx_gmxx_inf_mode mode; |