diff options
| author | Keith Packard <keithp@keithp.com> | 2012-01-09 11:37:59 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-09 11:37:59 -0800 |
| commit | 1f5587e14406c083687203030db6a11691ac9d9f (patch) | |
| tree | 915c1a12a150595f1bd00e4822327cf743f9ec3c /hw/xfree86 | |
| parent | a97252db24669a3e26a935024ea38b8a28d30586 (diff) | |
| parent | 6269977c91071e0ea16ca5b4b8e15fd6db0b6fcf (diff) | |
Merge remote-tracking branch 'kibi/master'
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/compiler.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 9e00d7571..34e60c52a 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -397,25 +397,6 @@ extern _X_EXPORT unsigned int inl(unsigned int port); #include <machine/pio.h> #endif /* __NetBSD__ */ -# elif defined(linux) && defined(__ia64__) - -# include <inttypes.h> - -# include <sys/io.h> - -# undef outb -# undef outw -# undef outl -# undef inb -# undef inw -# undef inl -extern _X_EXPORT void outb(unsigned long port, unsigned char val); -extern _X_EXPORT void outw(unsigned long port, unsigned short val); -extern _X_EXPORT void outl(unsigned long port, unsigned int val); -extern _X_EXPORT unsigned int inb(unsigned long port); -extern _X_EXPORT unsigned int inw(unsigned long port); -extern _X_EXPORT unsigned int inl(unsigned long port); - # elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__) # include <inttypes.h> |