diff options
author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-07 13:56:21 +0800 |
---|---|---|
committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-07 13:56:21 +0800 |
commit | ea6aa41b21de5095d17d43776c8a8c472fad9cd4 (patch) | |
tree | b7e245793e9306d8f602c87a90c76bd0b2e7be1e /include | |
parent | 7c8718a8d86182a1ea3ad6d89e2ff0201ca2a4a9 (diff) | |
parent | 23fae65a58952ca3de64e68c13c0d3527bec6f0a (diff) |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_android
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fec.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/fec.h b/include/linux/fec.h index a9d659456eba..97a56d4add74 100644 --- a/include/linux/fec.h +++ b/include/linux/fec.h @@ -21,9 +21,6 @@ struct fec_platform_data { int (*power_hibernate) (struct phy_device *); phy_interface_t phy; unsigned char mac[ETH_ALEN]; -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - unsigned int gpio_irq; -#endif }; #endif |