From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Wed, 27 Jun 2012 20:40:30 +0000 (+0300)
Subject: Merge branch 'master' into ofed
X-Git-Tag: compat-2012-07-02^0
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d3611b7ec4c2372c373fe0ece8cff6c98e742e16;p=~emulex%2Ftmp%2Fcompat%2F.git

Merge branch 'master' into ofed
---

d3611b7ec4c2372c373fe0ece8cff6c98e742e16
diff --cc include/linux/compat-3.2.h
index 921e288,ef27566..789b4b5
--- a/include/linux/compat-3.2.h
+++ b/include/linux/compat-3.2.h
@@@ -7,13 -7,13 +7,17 @@@
  
  #include <linux/skbuff.h>
  #include <linux/dma-mapping.h>
 +#include <linux/ethtool.h>
  
+ /* backports b4625dab */
+ #define  SDIO_CCCR_REV_3_00    3       /* CCCR/FBR Version 3.00 */
+ #define  SDIO_SDIO_REV_3_00    4       /* SDIO Spec Version 3.00 */
+ 
  #define PMSG_IS_AUTO(msg)	(((msg).event & PM_EVENT_AUTO) != 0)
  
 +extern int __ethtool_get_settings(struct net_device *dev,
 +				  struct ethtool_cmd *cmd);
 +
  /**
   * skb_frag_page - retrieve the page refered to by a paged fragment
   * @frag: the paged fragment