diff --git a/[refs] b/[refs] index 278bb44a1fbb..297a5186b872 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 141b9e665427aaaefaf76445dbc41fcd0311bbfb +refs/heads/master: 5d472b7377ce5f02929ae0bed53407aa795571dd diff --git a/trunk/drivers/net/ethernet/amd/depca.h b/trunk/drivers/net/ethernet/amd/depca.h index ee42648dbde6..cdcfe4252c16 100644 --- a/trunk/drivers/net/ethernet/amd/depca.h +++ b/trunk/drivers/net/ethernet/amd/depca.h @@ -157,8 +157,6 @@ */ #include -#define DEPCAIOCTL SIOCDEVPRIVATE - struct depca_ioctl { unsigned short cmd; /* Command to run */ unsigned short len; /* Length of the data buffer */ diff --git a/trunk/drivers/net/ethernet/dec/tulip/de4x5.h b/trunk/drivers/net/ethernet/dec/tulip/de4x5.h index 9f2877438fb0..ec756eba397b 100644 --- a/trunk/drivers/net/ethernet/dec/tulip/de4x5.h +++ b/trunk/drivers/net/ethernet/dec/tulip/de4x5.h @@ -991,8 +991,6 @@ */ #include -#define DE4X5IOCTL SIOCDEVPRIVATE - struct de4x5_ioctl { unsigned short cmd; /* Command to run */ unsigned short len; /* Length of the data buffer */ diff --git a/trunk/drivers/net/ethernet/jme.h b/trunk/drivers/net/ethernet/jme.h index c1f8b893e2ea..02ea27c1dcb5 100644 --- a/trunk/drivers/net/ethernet/jme.h +++ b/trunk/drivers/net/ethernet/jme.h @@ -102,7 +102,6 @@ enum jme_spi_op_bits { }; #define HALF_US 500 /* 500 ns */ -#define JMESPIIOCTL SIOCDEVPRIVATE #define PCI_PRIV_PE1 0xE4