Netdev List
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH] net: move ethtool include to where its used
Date: Fri,  3 Feb 2012 06:17:02 -0500	[thread overview]
Message-ID: <1328267822-25690-1-git-send-email-vapier@gentoo.org> (raw)

The linux/mii.h headers has long been standalone for userspace.  But a
recent commit added linux/ethtool.h to the include list even when it
isn't used.  Since we only need this with __KERNEL__, move the include
down to the right spot.  Now userland no longer needs to pull this in.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 include/linux/mii.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/mii.h b/include/linux/mii.h
index 2783eca..415b397 100644
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -9,7 +9,6 @@
 #define __LINUX_MII_H__
 
 #include <linux/types.h>
-#include <linux/ethtool.h>
 
 /* Generic MII registers. */
 #define MII_BMCR		0x00	/* Basic mode control register */
@@ -151,6 +150,7 @@ struct mii_ioctl_data {
 
 #ifdef __KERNEL__
 
+#include <linux/ethtool.h>
 #include <linux/if.h>
 
 struct ethtool_cmd;
-- 
1.7.8.4

             reply	other threads:[~2012-02-03 11:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-03 11:17 Mike Frysinger [this message]
2012-02-04 21:23 ` [PATCH] net: move ethtool include to where its used David Miller
2012-02-05  2:20   ` Mike Frysinger
2012-02-05  5:24     ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1328267822-25690-1-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox