All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Christian Dietrich  <qy03fugy@stud.informatik.uni-erlangen.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	qy03fugy@stud.informatik.uni-erlangen.de, tglx@linutronix.de,
	mingo@elte.hu, borislav.petkov@amd.com
Subject: [tip:x86/cleanups] x86: Remove unnecessary #ifdef ACPI/X86_IO_ACPI
Date: Wed, 8 Sep 2010 08:35:47 GMT	[thread overview]
Message-ID: <tip-0f1cf415f00286a38f5ce35b459342dbfc895b50@git.kernel.org> (raw)
In-Reply-To: <d4376e6d79b8dc0f89a4b3ce4a880904a7b93ead.1283782701.git.qy03fugy@stud.informatik.uni-erlangen.de>

Commit-ID:  0f1cf415f00286a38f5ce35b459342dbfc895b50
Gitweb:     http://git.kernel.org/tip/0f1cf415f00286a38f5ce35b459342dbfc895b50
Author:     Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
AuthorDate: Mon, 6 Sep 2010 16:36:18 +0200
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 8 Sep 2010 08:14:02 +0200

x86: Remove unnecessary #ifdef ACPI/X86_IO_ACPI

The ACPI/X86_IO_ACPI ifdef isn't necessary at this point,
because it is checked in an outer ifdef level already and has no
effect here.

Cleanup only, no functional effect.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: vamos-dev@i4.informatik.uni-erlangen.de
LKML-Reference: <d4376e6d79b8dc0f89a4b3ce4a880904a7b93ead.1283782701.git.qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/kernel/early-quirks.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index e5cc7e8..e4bd78c 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -98,7 +98,6 @@ static void __init nvidia_bugs(int num, int slot, int func)
 }
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
-#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
 static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
 {
 	u32 d;
@@ -116,7 +115,6 @@ static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
 	d &= 0xff;
 	return d;
 }
-#endif
 
 static void __init ati_bugs(int num, int slot, int func)
 {

  parent reply	other threads:[~2010-09-08  8:36 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-06 14:35 [PATCH 00/14] Removing dead code Christian Dietrich
2010-09-06 14:35 ` Christian Dietrich
2010-09-06 14:35 ` [PATCH 01/14] arch/arm: Removing undead ifdef __ASSEMBLY__ Christian Dietrich
2010-09-06 14:35   ` Christian Dietrich
2010-09-06 14:36 ` [PATCH 02/14] arch/h8300: Removing dead ifdef __H8300_TLB_H__ Christian Dietrich
2010-09-06 18:32   ` Andreas Schwab
2010-09-06 14:36 ` [PATCH 03/14] arch/parisc: Removing undead ifdef CONFIG_PA20 Christian Dietrich
2010-09-06 14:36   ` Christian Dietrich
2010-09-08 21:18   ` Kyle McMartin
2010-09-06 14:36 ` [PATCH 04/14] arch/{s390,powerpc}: Removing undead ifdef __KERNEL__ Christian Dietrich
2010-09-06 14:36 ` [PATCH 05/14] arch/x86: Removing undead ifdef ACPI/X86_IO_ACPI Christian Dietrich
2010-09-06 14:57   ` Borislav Petkov
2010-09-08  8:35   ` tip-bot for Christian Dietrich [this message]
2010-09-06 14:36 ` [PATCH 06/14] drivers/net: Removing undead ifdef CHELSIO_T1_1G Christian Dietrich
2010-09-06 14:36   ` Christian Dietrich
2010-09-07  1:39   ` David Miller
2010-09-06 14:36 ` [PATCH 07/14] drivers/scsi: Removing undead ifdef __ISAPNP__ Christian Dietrich
2010-09-06 14:36 ` [PATCH 08/14] drivers/scsi: Removing undead ifdef CONFIG_PCI Christian Dietrich
2010-09-06 14:36 ` [PATCH 09/14] drivers/scsi: Removing undead ifdef REAL_DMA Christian Dietrich
2010-09-06 14:36 ` [PATCH 10/14] drivers/video: Removing undead ifdef ATAFB_FALCON Christian Dietrich
2010-09-10 17:50   ` Krzysztof Helt
2010-10-03  8:15     ` Geert Uytterhoeven
2010-09-06 14:36 ` [PATCH 11/14] drivers/video: Removing undead ifdef CONFIG_FB_MATROX_G Christian Dietrich
2010-09-06 14:36   ` [PATCH 11/14] drivers/video: Removing undead ifdef Christian Dietrich
2010-09-07 13:02   ` [PATCH 11/14] drivers/video: Removing undead ifdef CONFIG_FB_MATROX_G Jean Delvare
2010-09-07 13:02     ` [PATCH 11/14] drivers/video: Removing undead ifdef Jean Delvare
2010-09-06 14:36 ` [PATCH 12/14] include/linux: Removing undead ifdef __KERNEL__ Christian Dietrich
2010-09-06 16:16   ` Cyrill Gorcunov
2010-09-06 14:37 ` [PATCH 13/14] kernel/: Removing undead ifdef CONFIG_SMP Christian Dietrich
2010-09-08  8:36   ` [tip:sched/core] sched: Remove unnecessary #ifdef CONFIG_SMP tip-bot for Christian Dietrich
2010-09-06 14:37 ` [PATCH 14/14] kernel/: Removing undead ifdef CONFIG_DEBUG_LOCK_ALLOC Christian Dietrich
2010-09-06 16:13   ` Paul E. McKenney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-0f1cf415f00286a38f5ce35b459342dbfc895b50@git.kernel.org \
    --to=qy03fugy@stud.informatik.uni-erlangen.de \
    --cc=borislav.petkov@amd.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.