summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2014-08-12 15:28:06 -0400
committerKyle McMartin <kmcmarti@redhat.com>2014-08-12 15:29:34 -0400
commit1fd75f556a645ecdd4d7ddf6016b056b74d3aa87 (patch)
tree5b098fc2f17eb6e19d75d082d9d03c85000f0a1b
parent980c60263ebb49aeac673643dba0d60ac936221b (diff)
downloadkernel-1fd75f556a645ecdd4d7ddf6016b056b74d3aa87.tar.gz
kernel-1fd75f556a645ecdd4d7ddf6016b056b74d3aa87.tar.xz
kernel-1fd75f556a645ecdd4d7ddf6016b056b74d3aa87.zip
tegra-powergate-header-move.patch: deal with armv7hl breakage
-rw-r--r--kernel.spec11
-rw-r--r--tegra-powergate-header-move.patch13
2 files changed, 22 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 1936a0e8c..f1e05118d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -624,6 +624,9 @@ Patch25063: disable-libdw-unwind-on-non-x86.patch
#rhbz 983342 1093120
Patch25069: 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch
+#rhbz 1021036, submitted upstream
+Patch25110: 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
+
Patch26000: perf-lib64.patch
# Patch series from Hans for various backlight and platform driver fixes
@@ -633,8 +636,7 @@ Patch26005: eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.patch
Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
-#rhbz 1021036, submitted upstream
-Patch25110: 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
+Patch27000: tegra-powergate-header-move.patch
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1358,6 +1360,8 @@ ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
#rhbz 1021036, submitted upstream
ApplyPatch 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
+ApplyPatch tegra-powergate-header-move.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2240,6 +2244,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org>
+- tegra-powergate-header-move.patch: deal with armv7hl breakage
+
* Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git4.1
- Add updated crash driver from Dave Anderson and re-enable
diff --git a/tegra-powergate-header-move.patch b/tegra-powergate-header-move.patch
new file mode 100644
index 000000000..436ec083a
--- /dev/null
+++ b/tegra-powergate-header-move.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/ata/ahci_tegra.c b/drivers/ata/ahci_tegra.c
+index fc3df47..4392190 100644
+--- a/drivers/ata/ahci_tegra.c
++++ b/drivers/ata/ahci_tegra.c
+@@ -24,7 +24,7 @@
+ #include <linux/module.h>
+ #include <linux/of_device.h>
+ #include <linux/platform_device.h>
+-#include <linux/tegra-powergate.h>
++#include <soc/tegra/powergate.h>
+ #include <linux/regulator/consumer.h>
+ #include "ahci.h"
+