From 55d4da2671358139ee17b1a4251aaef25f5bf11a Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 29 Nov 2009 15:40:42 +0000
Subject: ethtool: Remove duplicate type definitions

<linux/ethtool.h> and ethtool-copy.h now include <linux/types.h>, which
provides these type definitions.

The duplicate type definitions in ethtool-util.h conflict with those in
<asm/types.h> on Alpha, as reported in <http://bugs.debian.org/545850>.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---
 ethtool-util.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'ethtool-util.h')

diff --git a/ethtool-util.h b/ethtool-util.h
index 5572771..8ae7e47 100644
--- a/ethtool-util.h
+++ b/ethtool-util.h
@@ -5,11 +5,7 @@
 
 #include <sys/types.h>
 
-/* hack, so we may include kernel's ethtool.h */
-typedef unsigned long long __u64;
-typedef __uint32_t __u32;         /* ditto */
-typedef __uint16_t __u16;         /* ditto */
-typedef __uint8_t __u8;           /* ditto */
+#include "ethtool-copy.h"
 
 /* historical: we used to use kernel-like types; remove these once cleaned */
 typedef unsigned long long u64;
@@ -17,8 +13,6 @@ typedef __uint32_t u32;         /* ditto */
 typedef __uint16_t u16;         /* ditto */
 typedef __uint8_t u8;           /* ditto */
 
-#include "ethtool-copy.h"
-
 /* National Semiconductor DP83815, DP83816 */
 int natsemi_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
 int natsemi_dump_eeprom(struct ethtool_drvinfo *info,
-- 
cgit v1.2.1