Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / include / linux / fsl_devices.h

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index abb64c4..73710d6 100644 (file)
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -120,44 +120,5 @@ struct fsl_spi_platform_data {
        u32     sysclk;
 };
 
-/* Ethernet interface (phy management and speed)
-*/
-enum enet_interface {
-       ENET_10_MII,            /* 10 Base T,   MII interface */
-       ENET_10_RMII,           /* 10 Base T,  RMII interface */
-       ENET_10_RGMII,          /* 10 Base T, RGMII interface */
-       ENET_100_MII,           /* 100 Base T,   MII interface */
-       ENET_100_RMII,          /* 100 Base T,  RMII interface */
-       ENET_100_RGMII,         /* 100 Base T, RGMII interface */
-       ENET_1000_GMII,         /* 1000 Base T,  GMII interface */
-       ENET_1000_RGMII,        /* 1000 Base T, RGMII interface */
-       ENET_1000_TBI,          /* 1000 Base T,   TBI interface */
-       ENET_1000_RTBI          /* 1000 Base T,  RTBI interface */
-};
-
-struct ucc_geth_platform_data {
-       /* device specific information */
-       u32                     device_flags;
-       u32                     phy_reg_addr;
-
-       /* board specific information */
-       u32                     board_flags;
-       u8                      rx_clock;
-       u8                      tx_clock;
-       u32                     phy_id;
-       enum enet_interface     phy_interface;
-       u32                     phy_interrupt;
-       u8                      mac_addr[6];
-};
-
-/* Flags related to UCC Gigabit Ethernet device features */
-#define FSL_UGETH_DEV_HAS_GIGABIT              0x00000001
-#define FSL_UGETH_DEV_HAS_COALESCE             0x00000002
-#define FSL_UGETH_DEV_HAS_RMON                 0x00000004
-
-/* Flags in ucc_geth_platform_data */
-#define FSL_UGETH_BRD_HAS_PHY_INTR             0x00000001
-                               /* if not set use a timer */
-
 #endif /* _FSL_DEVICE_H_ */
 #endif /* __KERNEL__ */