git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ia64
/
hp
/
sim
/
boot
/
fw-emu.c
diff --git
a/arch/ia64/hp/sim/boot/fw-emu.c
b/arch/ia64/hp/sim/boot/fw-emu.c
index
5c46928
..
5a0a7af
100644
(file)
--- a/
arch/ia64/hp/sim/boot/fw-emu.c
+++ b/
arch/ia64/hp/sim/boot/fw-emu.c
@@
-4,7
+4,6
@@
* Copyright (C) 1998-2001 Hewlett-Packard Co
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
* Copyright (C) 1998-2001 Hewlett-Packard Co
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
-#include <linux/config.h>
#ifdef CONFIG_PCI
# include <linux/pci.h>
#ifdef CONFIG_PCI
# include <linux/pci.h>
@@
-237,17
+236,6
@@
sal_emulator (long index, unsigned long in1, unsigned long in2,
return ((struct sal_ret_values) {status, r9, r10, r11});
}
return ((struct sal_ret_values) {status, r9, r10, r11});
}
-
-/*
- * This is here to work around a bug in egcs-1.1.1b that causes the
- * compiler to crash (seems like a bug in the new alias analysis code.
- */
-void *
-id (long addr)
-{
- return (void *) addr;
-}
-
struct ia64_boot_param *
sys_fw_init (const char *args, int arglen)
{
struct ia64_boot_param *
sys_fw_init (const char *args, int arglen)
{