diff options
| author | Kyle McMartin <kyle@redhat.com> | 2013-06-13 14:20:28 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2013-06-13 14:20:28 -0400 |
| commit | 2afa3c795210e222094c47d5c3a4ff06d00f78da (patch) | |
| tree | dcae6ba553fd5feb91658f3ef9b368611d612289 | |
| parent | f65d528f9143c4352b51e0b2bf54dcde3f2086b6 (diff) | |
| download | kernel-2afa3c795210e222094c47d5c3a4ff06d00f78da.tar.gz kernel-2afa3c795210e222094c47d5c3a4ff06d00f78da.tar.xz kernel-2afa3c795210e222094c47d5c3a4ff06d00f78da.zip | |
drop upstream arm-export-read_current_timer.patch
| -rw-r--r-- | arm-export-read_current_timer.patch | 10 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/arm-export-read_current_timer.patch b/arm-export-read_current_timer.patch deleted file mode 100644 index 5059d6862..000000000 --- a/arm-export-read_current_timer.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-3.7.0-0.rc2.git1.2.fc19.x86_64/arch/arm/kernel/armksyms.c.orig 2012-10-01 00:47:46.000000000 +0100 -+++ linux-3.7.0-0.rc2.git1.2.fc19.x86_64/arch/arm/kernel/armksyms.c 2012-10-24 09:06:46.570452677 +0100 -@@ -50,6 +50,7 @@ - - /* platform dependent support */ - EXPORT_SYMBOL(arm_delay_ops); -+EXPORT_SYMBOL(read_current_timer); - - /* networking */ - EXPORT_SYMBOL(csum_partial); diff --git a/kernel.spec b/kernel.spec index 09b547226..f05724537 100644 --- a/kernel.spec +++ b/kernel.spec @@ -695,7 +695,6 @@ Patch15000: nowatchdog-on-virt.patch # ARM -Patch21000: arm-export-read_current_timer.patch # lpae Patch21001: arm-lpae-ax88796.patch @@ -1319,7 +1318,6 @@ ApplyPatch debug-bad-pte-modules.patch # # ARM # -ApplyPatch arm-export-read_current_timer.patch ApplyPatch arm-lpae-ax88796.patch ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch ApplyPatch arm-omap-load-tfp410.patch @@ -2283,6 +2281,10 @@ fi # ||----w | # || || %changelog +* Thu Jun 13 2013 Kyle McMartin <kyle@redhat.com> +- arm-export-read_current_timer.patch: drop upstream patch + (results in duplicate exports) + * Wed Jun 12 2013 Peter Robinson <pbrobinson@fedoraproject.org> - Minor ARM config updates |