diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-07 12:54:08 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-07 12:54:08 +1000 |
| commit | ae6e59caefd8d4097ccb096c95df95ec7e52fe88 (patch) | |
| tree | f72b77d41c9f5a3b18fb52e505d60dba2ad913a5 /include/linux | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
| parent | f379188958ae8af30105eb1f27d0e0abf6a51558 (diff) | |
Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsl_devices.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 7ef1caf5026..f2a78b5e8b5 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -18,7 +18,6 @@ #define _FSL_DEVICE_H_ #include <linux/types.h> -#include <linux/phy.h> /* * Some conventions on how we handle peripherals on Freescale chips @@ -44,27 +43,6 @@ * */ -struct gianfar_platform_data { - /* device specific information */ - u32 device_flags; - char bus_id[BUS_ID_SIZE]; - phy_interface_t interface; -}; - -struct gianfar_mdio_data { - /* board specific information */ - int irq[32]; -}; - -/* Flags in gianfar_platform_data */ -#define FSL_GIANFAR_BRD_HAS_PHY_INTR 0x00000001 /* set or use a timer */ -#define FSL_GIANFAR_BRD_IS_REDUCED 0x00000002 /* Set if RGMII, RMII */ - -struct fsl_i2c_platform_data { - /* device specific information */ - u32 device_flags; -}; - /* Flags related to I2C device features */ #define FSL_I2C_DEV_SEPARATE_DFSRR 0x00000001 #define FSL_I2C_DEV_CLOCK_5200 0x00000002 |