diff options
author | Greg Kroah-Hartman | 2019-06-17 11:23:24 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-06-17 11:23:24 +0200 |
commit | a954e5fb4bc2d401b8fc3b4c7cd316497ff80225 (patch) | |
tree | 06af23b232c7c2e795a2fef8a5a0604ec64d5092 /drivers/char/xillybus/xillybus_of.c | |
parent | Revert "usb: mtu3: fix up undefined reference to usb_debug_root" (diff) | |
parent | Linux 5.2-rc5 (diff) | |
download | kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.gz kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.xz kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.zip |
Merge 5.2-rc5 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/xillybus/xillybus_of.c')
-rw-r--r-- | drivers/char/xillybus/xillybus_of.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c index 4d6625ccb48f..bfafd8f5e826 100644 --- a/drivers/char/xillybus/xillybus_of.c +++ b/drivers/char/xillybus/xillybus_of.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/drivers/misc/xillybus_of.c * * Copyright 2011 Xillybus Ltd, http://xillybus.com * * Driver for the Xillybus FPGA/host framework using Open Firmware. - * - * This program is free software; you can redistribute it and/or modify - * it under the smems of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. */ #include <linux/module.h> |