Skip to content

Commit 4c9b0a0

Browse files
committed
Merge branch 'for-6.1' into 'master'
2 parents 9efedae + 9ccc2f7 commit 4c9b0a0

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

4.5/wacom.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0-or-later */
22
/*
3-
* drivers/input/tablet/wacom.h
4-
*
53
* USB Wacom tablet support
64
*
75
* Copyright (c) 2000-2004 Vojtech Pavlik <[email protected]>
@@ -78,10 +76,9 @@
7876
* - integration of the Bluetooth devices
7977
*/
8078

81-
/*
82-
*/
8379
#ifndef WACOM_H
8480
#define WACOM_H
81+
8582
#include "../config.h"
8683
#include <linux/kernel.h>
8784
#include <linux/slab.h>

4.5/wacom_sys.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
/*
3-
* drivers/input/tablet/wacom_sys.c
4-
*
53
* USB Wacom tablet support - system specific code
64
*/
75

8-
/*
9-
*/
10-
116
#include "wacom_wac.h"
127
#include "wacom.h"
138
#include <linux/input/mt.h>

4.5/wacom_wac.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
/*
3-
* drivers/input/tablet/wacom_wac.c
4-
*
53
* USB Wacom tablet support - Wacom specific code
64
*/
75

8-
/*
9-
*/
10-
116
#include "wacom_wac.h"
127
#include "wacom.h"
138
#include <linux/input/mt.h>

4.5/wacom_wac.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0-or-later */
2-
/*
3-
* drivers/input/tablet/wacom_wac.h
4-
*/
2+
53
#ifndef WACOM_WAC_H
64
#define WACOM_WAC_H
75

0 commit comments

Comments
 (0)