netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ethtool: Remove duplicate type definitions
@ 2009-11-29 15:40 Ben Hutchings
  2009-11-30 13:30 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Ben Hutchings @ 2009-11-29 15:40 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: Aníbal Monsalve Salazar, netdev

<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>
--- 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 __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,


-- 
Ben Hutchings
Quantity is no substitute for quality, but it's the only one we've got.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-11-30 13:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-29 15:40 [PATCH] ethtool: Remove duplicate type definitions Ben Hutchings
2009-11-30 13:30 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).