mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
upgrade to 2.6.30-rc6, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15912 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -3,8 +3,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
|
||||
arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c b/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
|
||||
index 4812370..e583889 100644
|
||||
--- a/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
|
||||
+++ b/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
|
||||
@@ -29,6 +29,7 @@
|
||||
@@ -15,7 +13,7 @@ index 4812370..e583889 100644
|
||||
|
||||
#include <asm/octeon/cvmx.h>
|
||||
#include <asm/octeon/cvmx-spinlock.h>
|
||||
@@ -69,6 +70,7 @@ struct cvmx_sysinfo *cvmx_sysinfo_get(void)
|
||||
@@ -69,6 +70,7 @@ struct cvmx_sysinfo *cvmx_sysinfo_get(vo
|
||||
{
|
||||
return &(state.sysinfo);
|
||||
}
|
||||
@@ -23,6 +21,3 @@ index 4812370..e583889 100644
|
||||
|
||||
/**
|
||||
* This function is used in non-simple executive environments (such as
|
||||
--
|
||||
1.6.0.6
|
||||
|
||||
|
||||
Reference in New Issue
Block a user