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/ide/triflex.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/ide/triflex.c')
| -rw-r--r-- | drivers/ide/triflex.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c index 7f1af9493f0e..16ddd0956832 100644 --- a/drivers/ide/triflex.c +++ b/drivers/ide/triflex.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * IDE Chipset driver for the Compaq TriFlex IDE controller. * @@ -5,19 +6,6 @@ * * Copyright (C) 2002 Hewlett-Packard Development Group, L.P. * Author: Torben Mathiasen <torben.mathiasen@hp.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Loosely based on the piix & svwks drivers. * |