Merge branch 'for-6.1/wacom' into for-linus

- Simplify comments (Christophe JAILLET)
This commit is contained in:
Benjamin Tissoires 2022-10-05 10:36:30 +01:00
commit 1af52d6b35
4 changed files with 2 additions and 17 deletions

View File

@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
/* /*
* drivers/input/tablet/wacom.h
*
* USB Wacom tablet support * USB Wacom tablet support
* *
* Copyright (c) 2000-2004 Vojtech Pavlik <vojtech@ucw.cz> * Copyright (c) 2000-2004 Vojtech Pavlik <vojtech@ucw.cz>
@ -78,10 +76,9 @@
* - integration of the Bluetooth devices * - integration of the Bluetooth devices
*/ */
/*
*/
#ifndef WACOM_H #ifndef WACOM_H
#define WACOM_H #define WACOM_H
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>

View File

@ -1,13 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
/* /*
* drivers/input/tablet/wacom_sys.c
*
* USB Wacom tablet support - system specific code * USB Wacom tablet support - system specific code
*/ */
/*
*/
#include "wacom_wac.h" #include "wacom_wac.h"
#include "wacom.h" #include "wacom.h"
#include <linux/input/mt.h> #include <linux/input/mt.h>

View File

@ -1,13 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
/* /*
* drivers/input/tablet/wacom_wac.c
*
* USB Wacom tablet support - Wacom specific code * USB Wacom tablet support - Wacom specific code
*/ */
/*
*/
#include "wacom_wac.h" #include "wacom_wac.h"
#include "wacom.h" #include "wacom.h"
#include <linux/input/mt.h> #include <linux/input/mt.h>

View File

@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* drivers/input/tablet/wacom_wac.h
*/
#ifndef WACOM_WAC_H #ifndef WACOM_WAC_H
#define WACOM_WAC_H #define WACOM_WAC_H