Canonicalize conversion operators

[deliverable/binutils-gdb.git] / sim / bfin / dv-eth_phy.c

diff --git a/sim/bfin/dv-eth_phy.c b/sim/bfin/dv-eth_phy.c
index bc7413e0a2709b745aa80b25c68578b515a2ae90..0349b24eaef76747b3f4b5ab6fa0773185eb8409 100644 (file)
--- a/sim/bfin/dv-eth_phy.c
+++ b/sim/bfin/dv-eth_phy.c
@@ -1,6 +1,6 @@
 /* Ethernet Physical Receiver model.
 
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2017 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -23,11 +23,10 @@
 #include "sim-main.h"
 #include "devices.h"
 
-#ifdef HAVE_LINUX_MII_H
+#if defined (HAVE_LINUX_MII_H) && defined (HAVE_LINUX_TYPES_H)
 
 /* Workaround old/broken linux headers.  */
-#define _LINUX_TYPES_H
-#define __u16 unsigned short
+#include <linux/types.h>
 #include <linux/mii.h>
 
 #define REG_PHY_SIZE 0x20
@@ -201,7 +200,8 @@ eth_phy_finish (struct hw *me)
 
 #endif
 
-const struct hw_descriptor dv_eth_phy_descriptor[] = {
+const struct hw_descriptor dv_eth_phy_descriptor[] =
+{
   {"eth_phy", eth_phy_finish,},
   {NULL, NULL},
 };