From: Eric Sesterhenn / snakebyte <snakebyte@gmx.de>
To: linux-kernel@vger.kernel.org
Subject: [Patch] es7000 broken without acpi
Date: Mon, 12 Dec 2005 23:50:19 +0100 [thread overview]
Message-ID: <1134427819.18385.2.camel@alice> (raw)
hi,
a make randconfig gave me a situation where es7000 was enabled, but acpi wasnt
( dont know if this makes sense ), gcc gave me some compiling errors, which the
following patch fixes. Please cc me as i am not on the list. Thanks.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
diff -up linux-2.6.15-rc5-git2/arch/i386/mach-es7000.orig/es7000.h linux-2.6.15-rc5-git2/arch/i386/mach-es7000/es7000.h
--- linux-2.6.15-rc5-git2/arch/i386/mach-es7000.orig/es7000.h 2005-12-12 23:44:39.000000000 +0100
+++ linux-2.6.15-rc5-git2/arch/i386/mach-es7000/es7000.h 2005-12-12 23:43:51.000000000 +0100
@@ -83,6 +83,7 @@ struct es7000_oem_table {
struct psai psai;
};
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
struct acpi_table_sdt {
unsigned long pa;
unsigned long count;
@@ -98,6 +99,7 @@ struct oem_table {
u32 OEMTableAddr;
u32 OEMTableSize;
};
+#endif
struct mip_reg {
unsigned long long off_0;
diff -up linux-2.6.15-rc5-git2/arch/i386/mach-es7000.orig/es7000plat.c linux-2.6.15-rc5-git2/arch/i386/mach-es7000/es7000plat.c
--- linux-2.6.15-rc5-git2/arch/i386/mach-es7000.orig/es7000plat.c 2005-12-12 23:44:39.000000000 +0100
+++ linux-2.6.15-rc5-git2/arch/i386/mach-es7000/es7000plat.c 2005-12-12 23:43:20.000000000 +0100
@@ -92,7 +92,9 @@ setup_unisys(void)
es7000_plat = ES7000_ZORRO;
else
es7000_plat = ES7000_CLASSIC;
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
ioapic_renumber_irq = es7000_rename_gsi;
+#endif
}
/*
@@ -160,6 +162,7 @@ parse_unisys_oem (char *oemptr)
return es7000_plat;
}
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
int __init
find_unisys_acpi_oem_table(unsigned long *oem_addr)
{
@@ -212,6 +215,7 @@ find_unisys_acpi_oem_table(unsigned long
}
return -1;
}
+#endif
static void
es7000_spin(int n)
next reply other threads:[~2005-12-12 22:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-12 22:50 Eric Sesterhenn / snakebyte [this message]
2006-01-03 23:48 ` [Patch] es7000 broken without acpi Andrew Morton
2006-01-04 10:05 ` Peter Hagervall
-- strict thread matches above, loose matches on Subject: below --
2006-01-04 1:36 Protasevich, Natalie
2006-01-04 1:51 ` Andrew Morton
2006-01-04 2:46 Protasevich, Natalie
2006-01-04 15:05 Protasevich, Natalie
2006-01-04 15:40 ` Andi Kleen
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=1134427819.18385.2.camel@alice \
--to=snakebyte@gmx.de \
--cc=linux-kernel@vger.kernel.org \
/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.