| Message ID | 1259509242.3709.69.camel@localhost |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On 11/29/2009 10:40 AM, Ben Hutchings wrote: > <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> applied -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 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,
<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>