diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-06-19 12:04:55 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-06-19 12:07:29 +0200 |
| commit | 52d2d44eee8091e740d0d275df1311fb8373c9a9 (patch) | |
| tree | 4aff282e84b3469f18cf9717490b892f6f39198f /arch/powerpc/platforms/52xx/media5200.c | |
| parent | Merge tag 'drm-misc-next-2019-06-14' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.tar.xz linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.zip | |
Merge v5.2-rc5 into drm-next
Maarten needs -rc4 backmerged so he can pull in the fbcon notifier
removal topic branch into drm-misc-next.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'arch/powerpc/platforms/52xx/media5200.c')
| -rw-r--r-- | arch/powerpc/platforms/52xx/media5200.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c index 1fcab233d2f2..07c5bc4ed0b5 100644 --- a/arch/powerpc/platforms/52xx/media5200.c +++ b/arch/powerpc/platforms/52xx/media5200.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Support for 'media5200-platform' compatible boards. * * Copyright (C) 2008 Secret Lab Technologies Ltd. * - * 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. - * * Description: * This code implements support for the Freescape Media5200 platform * (built around the MPC5200 SoC). @@ -17,7 +13,6 @@ * a cascaded interrupt controller driver which attaches itself to the * Virtual IRQ subsystem after the primary mpc5200 interrupt controller * is initialized. - * */ #undef DEBUG |