diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 03:21:15 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 03:21:15 -0400 |
| commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
| tree | d1feb7102591a811b4458e2e209d476580ae3687 /include/linux/libps2.h | |
| parent | 4850f26abfcac9ed28a4db5817b46dc0bfbbbae0 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/libps2.h')
| -rw-r--r-- | include/linux/libps2.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/libps2.h b/include/linux/libps2.h index 5f18fe02ae37..53f7e4d0f4b7 100644 --- a/include/linux/libps2.h +++ b/include/linux/libps2.h | |||
| @@ -1,13 +1,10 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
| 1 | #ifndef _LIBPS2_H | 2 | #ifndef _LIBPS2_H |
| 2 | #define _LIBPS2_H | 3 | #define _LIBPS2_H |
| 3 | 4 | ||
| 4 | /* | 5 | /* |
| 5 | * Copyright (C) 1999-2002 Vojtech Pavlik | 6 | * Copyright (C) 1999-2002 Vojtech Pavlik |
| 6 | * Copyright (C) 2004 Dmitry Torokhov | 7 | * Copyright (C) 2004 Dmitry Torokhov |
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify it | ||
| 9 | * under the terms of the GNU General Public License version 2 as published by | ||
| 10 | * the Free Software Foundation. | ||
| 11 | */ | 8 | */ |
| 12 | 9 | ||
| 13 | #include <linux/bitops.h> | 10 | #include <linux/bitops.h> |