From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Dec 2018 05:39:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'char-misc/char-misc-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=004586fae44ebaceae68419ea2776e4733c5a0f6;p=users%2Fwilly%2Flinux.git

Merge remote-tracking branch 'char-misc/char-misc-next'
---

004586fae44ebaceae68419ea2776e4733c5a0f6
diff --cc drivers/misc/Makefile
index fe3134cf3008,b76d611c87de..f8d462054af8
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -57,4 -57,5 +57,5 @@@ obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed
  obj-$(CONFIG_ASPEED_LPC_SNOOP)	+= aspeed-lpc-snoop.o
  obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
  obj-$(CONFIG_OCXL)		+= ocxl/
 -obj-$(CONFIG_MISC_RTSX)		+= cardreader/
 +obj-y		+= cardreader/
+ obj-$(CONFIG_PVPANIC)   	+= pvpanic.o