Sync up stabilization with f29
This commit is contained in:
parent
6fcbd945bc
commit
764628643c
10852 changed files with 20070 additions and 29042 deletions
|
|
@ -284,10 +284,10 @@ diff --git a/drivers/char/Makefile b/drivers/char/Makefile
|
|||
index 6e6c244..29cc9c8 100644
|
||||
--- a/drivers/char/Makefile
|
||||
+++ b/drivers/char/Makefile
|
||||
@@ -60,3 +60,5 @@ js-rtc-y = rtc.o
|
||||
|
||||
@@ -58,3 +58,5 @@ js-rtc-y = rtc.o
|
||||
obj-$(CONFIG_XILLYBUS) += xillybus/
|
||||
obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o
|
||||
obj-$(CONFIG_ADI) += adi.o
|
||||
+
|
||||
+obj-$(CONFIG_CRASH) += crash.o
|
||||
diff --git a/drivers/char/crash.c b/drivers/char/crash.c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue