diff options
author | 2019-06-19 15:18:48 +0200 | |
---|---|---|
committer | 2019-06-19 15:18:48 +0200 | |
commit | 2ee692802b8f6c54bd6499addd3d07c2833d84d8 (patch) | |
tree | 6aa9a7de774804de0d5a944436a380eb99a6ac68 /drivers/ata/sata_promise.c | |
parent | video: fbdev: pvr2fb: add COMPILE_TEST support (diff) | |
parent | backlight: simplify lcd notifier (diff) | |
download | linux-dev-2ee692802b8f6c54bd6499addd3d07c2833d84d8.tar.xz linux-dev-2ee692802b8f6c54bd6499addd3d07c2833d84d8.zip |
Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
topic/remove-fbcon-notifiers:
- remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking
- assorted locking checks in vt/console code
- assorted notifier and cleanups in fbdev and backlight code
One trivial merge conflict fixed.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/ata/sata_promise.c')
-rw-r--r-- | drivers/ata/sata_promise.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index d032bf657f70..f4dfec3b6e42 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sata_promise.c - Promise SATA * @@ -8,27 +9,10 @@ * * Copyright 2003-2004 Red Hat, Inc. * - * - * 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, 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. 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; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - * * libata documentation is available via 'make {ps|pdf}docs', * as Documentation/driver-api/libata.rst * * Hardware information only available under NDA. - * */ #include <linux/kernel.h> |