From patchwork Fri May 12 08:42:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 9723753 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B254600CB for ; Fri, 12 May 2017 08:43:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FAFD2880B for ; Fri, 12 May 2017 08:43:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6415728810; Fri, 12 May 2017 08:43:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF8D12880B for ; Fri, 12 May 2017 08:43:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757520AbdELImb (ORCPT ); Fri, 12 May 2017 04:42:31 -0400 Received: from mx2.suse.de ([195.135.220.15]:44856 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756321AbdELIm3 (ORCPT ); Fri, 12 May 2017 04:42:29 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 36DC1ABD0; Fri, 12 May 2017 08:42:28 +0000 (UTC) From: Jiri Slaby To: airlied@linux.ie Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jiri Slaby , David Howells , Heiko Carstens , Yoshinori Sato , Rich Felker , linux-am33-list@redhat.com, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 2/2] frv, mn10300, s390, sh: remove empty vga.h Date: Fri, 12 May 2017 10:42:24 +0200 Message-Id: <20170512084224.4483-2-jslaby@suse.cz> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170512084224.4483-1-jslaby@suse.cz> References: <20170512084224.4483-1-jslaby@suse.cz> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Provided the architectures do not need any special handling (they seem not to support vga at all, actually), there is no need to have an empty vga.h. Let them refer to the generic one instead. Signed-off-by: Jiri Slaby Acked-by: Geert Uytterhoeven Acked-by: Martin Schwidefsky Cc: David Howells Cc: Heiko Carstens Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-am33-list@redhat.com Cc: linux-s390@vger.kernel.org Cc: linux-sh@vger.kernel.org --- arch/frv/include/asm/Kbuild | 1 + arch/frv/include/asm/vga.h | 17 ----------------- arch/mn10300/include/asm/Kbuild | 1 + arch/mn10300/include/asm/vga.h | 17 ----------------- arch/s390/include/asm/Kbuild | 1 + arch/s390/include/asm/vga.h | 6 ------ arch/sh/include/asm/Kbuild | 1 + arch/sh/include/asm/vga.h | 6 ------ 8 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 arch/frv/include/asm/vga.h delete mode 100644 arch/mn10300/include/asm/vga.h delete mode 100644 arch/s390/include/asm/vga.h delete mode 100644 arch/sh/include/asm/vga.h diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index cce3bc3603ea..6c4c8d07ba6e 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild @@ -7,5 +7,6 @@ generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h generic-y += preempt.h generic-y += trace_clock.h +generic-y += vga.h generic-y += word-at-a-time.h generic-y += kprobes.h diff --git a/arch/frv/include/asm/vga.h b/arch/frv/include/asm/vga.h deleted file mode 100644 index a702c800a229..000000000000 --- a/arch/frv/include/asm/vga.h +++ /dev/null @@ -1,17 +0,0 @@ -/* vga.h: VGA register stuff - * - * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. - * Written by David Howells (dhowells@redhat.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. - */ - -#ifndef _ASM_VGA_H -#define _ASM_VGA_H - - - -#endif /* _ASM_VGA_H */ diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild index ed810e7206e8..3d74b310f152 100644 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild @@ -9,4 +9,5 @@ generic-y += mm-arch-hooks.h generic-y += preempt.h generic-y += sections.h generic-y += trace_clock.h +generic-y += vga.h generic-y += word-at-a-time.h diff --git a/arch/mn10300/include/asm/vga.h b/arch/mn10300/include/asm/vga.h deleted file mode 100644 index 0163e50a3459..000000000000 --- a/arch/mn10300/include/asm/vga.h +++ /dev/null @@ -1,17 +0,0 @@ -/* MN10300 VGA register definitions - * - * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. - * Written by David Howells (dhowells@redhat.com) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public Licence - * as published by the Free Software Foundation; either version - * 2 of the Licence, or (at your option) any later version. - */ - -#ifndef _ASM_VGA_H -#define _ASM_VGA_H - - - -#endif /* _ASM_VGA_H */ diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 45092b12f54f..200c122cf5e0 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild @@ -14,4 +14,5 @@ generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h generic-y += preempt.h generic-y += trace_clock.h +generic-y += vga.h generic-y += word-at-a-time.h diff --git a/arch/s390/include/asm/vga.h b/arch/s390/include/asm/vga.h deleted file mode 100644 index d375526c261f..000000000000 --- a/arch/s390/include/asm/vga.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_S390_VGA_H -#define _ASM_S390_VGA_H - -/* Avoid compile errors due to missing asm/vga.h */ - -#endif /* _ASM_S390_VGA_H */ diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild index cf2a75063b53..5cb2027fb920 100644 --- a/arch/sh/include/asm/Kbuild +++ b/arch/sh/include/asm/Kbuild @@ -37,4 +37,5 @@ generic-y += termbits.h generic-y += termios.h generic-y += trace_clock.h generic-y += ucontext.h +generic-y += vga.h generic-y += xor.h diff --git a/arch/sh/include/asm/vga.h b/arch/sh/include/asm/vga.h deleted file mode 100644 index 06a5de8ace1a..000000000000 --- a/arch/sh/include/asm/vga.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_SH_VGA_H -#define __ASM_SH_VGA_H - -/* Stupid drivers. */ - -#endif /* __ASM_SH_VGA_H */