diff options
author | Florian Fainelli <florian@openwrt.org> | 2009-05-12 12:59:45 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2009-05-12 12:59:45 +0000 |
commit | cc3d03ca1f96ab38a38b456685f051e647213771 (patch) | |
tree | 526a82ed19c0560a04a91420329b9c4cc6679b17 /target/linux/cavium-octeon/patches/014-clocksource_fixes.patch | |
parent | 69c9b897e64c980f8f519a4b76c5184c1bcbd26a (diff) | |
download | master-187ad058-cc3d03ca1f96ab38a38b456685f051e647213771.tar.gz master-187ad058-cc3d03ca1f96ab38a38b456685f051e647213771.tar.bz2 master-187ad058-cc3d03ca1f96ab38a38b456685f051e647213771.zip |
[cavium-octeon] update to 2.6.30-rc5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15799 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cavium-octeon/patches/014-clocksource_fixes.patch')
-rw-r--r-- | target/linux/cavium-octeon/patches/014-clocksource_fixes.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch b/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch new file mode 100644 index 0000000000..bc72185f28 --- /dev/null +++ b/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch @@ -0,0 +1,31 @@ +From: Coly Li <coly.li@suse.de> +Date: Wed, 22 Apr 2009 19:06:06 +0000 (+0800) +Subject: MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read() +X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=06a4801f5f580bb98dd813466668592943f7baea;hp=bb13f16bff55ce7ffb67d0d600bab72b9cab773b + +MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read() + +This patch modifies parameter of octeon_cvmcount_read() from 'void' to +'struct clocksource *cs', which fixes compile warning for incompatible +parameter type. + +Signed-off-by: Coly Li <coly.li@suse.de> +Cc: David Daney <ddaney@caviumnetworks.com> +Cc: Ingo Molnar <mingo@elte.hu> +Reviewed-by: David Daney <ddaney@caviumnetworks.com> +Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +--- + +diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c +index 70fd92c..96110f2 100644 +--- a/arch/mips/cavium-octeon/csrc-octeon.c ++++ b/arch/mips/cavium-octeon/csrc-octeon.c +@@ -38,7 +38,7 @@ void octeon_init_cvmcount(void) + local_irq_restore(flags); + } + +-static cycle_t octeon_cvmcount_read(void) ++static cycle_t octeon_cvmcount_read(struct clocksource *cs) + { + return read_c0_cvmcount(); + } |