diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-08 22:07:30 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-08 22:07:30 +0300 |
commit | c6380ecd8e9bee7aba3d9a5a94b58168244c4a61 (patch) | |
tree | f8d9522c66e805f638399e094f8e0dfd92584d06 /drivers/pci/hotplug/ibmphp.h | |
parent | cdc2466df40f26af60f6b18123069bd52336a80c (diff) | |
parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
download | linux-c6380ecd8e9bee7aba3d9a5a94b58168244c4a61.tar.xz |
Merge tag 'v4.16-rc4' into next
Sync up with mainline to bring in RAVE MFD device core.
Diffstat (limited to 'drivers/pci/hotplug/ibmphp.h')
-rw-r--r-- | drivers/pci/hotplug/ibmphp.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h index d3256838cb05..fddb78606c74 100644 --- a/drivers/pci/hotplug/ibmphp.h +++ b/drivers/pci/hotplug/ibmphp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IBMPHP_H #define __IBMPHP_H @@ -11,21 +12,6 @@ * * All rights reserved. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * 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, GOOD TITLE or - * NON INFRINGEMENT. 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * * Send feedback to <gregkh@us.ibm.com> * */ |