From da99f20f026faababa016afb0c23cc8af405f4ee Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Wed, 8 Oct 2014 12:10:10 -0400
Subject: Linux v3.17-2860-gef0625b70dac

- Reenable debugging options.
- Temporarily disable aarch64patches
---
 crash-driver.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'crash-driver.patch')

diff --git a/crash-driver.patch b/crash-driver.patch
index 9ec016d50..4f99d487f 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -269,7 +269,7 @@ index 000000000000..fd4736ec99f5
 +
 +#endif /* _X86_CRASH_H */
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 6e9f74a5c095..ee6bae16b04c 100644
+index efefd12a0f7b..6a318132b7ee 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -4,6 +4,9 @@
@@ -283,13 +283,13 @@ index 6e9f74a5c095..ee6bae16b04c 100644
  
  config DEVKMEM
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index a324f9303e36..33ce2fb1d0a3 100644
+index d06cde26031b..0832636fd9bc 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -61,3 +61,5 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
- js-rtc-y = rtc.o
+@@ -62,3 +62,5 @@ js-rtc-y = rtc.o
  
  obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
+ obj-$(CONFIG_XILLYBUS)		+= xillybus/
 +
 +obj-$(CONFIG_CRASH)            += crash.o
 diff --git a/drivers/char/crash.c b/drivers/char/crash.c
-- 
cgit