diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-03 11:07:09 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-03 11:07:09 +0800 |
| commit | 8fa723312b9701e767c2eda46e4aabb21e21ccb3 (patch) | |
| tree | bcdb59722202cce2d2277d2fd7a785141cdf8bac /include | |
| parent | 029767ec3d45796a2d6a58debe3844cf6b814ec7 (diff) | |
| parent | 573bab0be2427d6664420eaf9d8e272dbe9d840f (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_android
Conflicts:
drivers/net/fec.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fec.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/fec.h b/include/linux/fec.h index 8f69cb58d458..a9d659456eba 100644 --- a/include/linux/fec.h +++ b/include/linux/fec.h @@ -3,7 +3,7 @@ * Copyright (c) 2009 Orex Computed Radiography * Baruch Siach <baruch@tkos.co.il> * - * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * * Header file for the FEC platform data * @@ -21,6 +21,9 @@ 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 |