diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-06-19 12:32:13 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-06-19 12:32:13 +0200 |
| commit | bcb7416e3480c1abb46266bdab874b3b3d6124cb (patch) | |
| tree | 9d889b14957c0e266697d0674675bc42b0899571 /arch/c6x/lib/pop_rts.S | |
| parent | drm/vc4: hdmi: Set default state margin at reset (diff) | |
| parent | Merge v5.2-rc5 into drm-next (diff) | |
| download | linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.xz linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.zip | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh
backmerge of drm-next to pull it in.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'arch/c6x/lib/pop_rts.S')
| -rw-r--r-- | arch/c6x/lib/pop_rts.S | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/c6x/lib/pop_rts.S b/arch/c6x/lib/pop_rts.S index d7d96c70e9e7..f129e32943c5 100644 --- a/arch/c6x/lib/pop_rts.S +++ b/arch/c6x/lib/pop_rts.S @@ -1,19 +1,7 @@ +;; SPDX-License-Identifier: GPL-2.0-or-later ;; Copyright 2010 Free Software Foundation, Inc. ;; Contributed by Bernd Schmidt <bernds@codesourcery.com>. ;; -;; 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. 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <linux/linkage.h> |