projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
include
/
linux
/
fsl_devices.h
diff --git
a/include/linux/fsl_devices.h
b/include/linux/fsl_devices.h
index
73710d6
..
1831b19
100644
(file)
--- a/
include/linux/fsl_devices.h
+++ b/
include/linux/fsl_devices.h
@@
-53,6
+53,7
@@
struct gianfar_platform_data {
u32 bus_id;
u32 phy_id;
u8 mac_addr[6];
u32 bus_id;
u32 phy_id;
u8 mac_addr[6];
+ phy_interface_t interface;
};
struct gianfar_mdio_data {
};
struct gianfar_mdio_data {
@@
-112,7
+113,7
@@
struct fsl_usb2_platform_data {
struct fsl_spi_platform_data {
u32 initial_spmode; /* initial SPMODE value */
u16 bus_num;
struct fsl_spi_platform_data {
u32 initial_spmode; /* initial SPMODE value */
u16 bus_num;
-
+ bool qe_mode;
/* board specific information */
u16 max_chipselect;
void (*activate_cs)(u8 cs, u8 polarity);
/* board specific information */
u16 max_chipselect;
void (*activate_cs)(u8 cs, u8 polarity);
@@
-120,5
+121,10
@@
struct fsl_spi_platform_data {
u32 sysclk;
};
u32 sysclk;
};
+struct mpc8xx_pcmcia_ops {
+ void(*hw_ctrl)(int slot, int enable);
+ int(*voltage_set)(int slot, int vcc, int vpp);
+};
+
#endif /* _FSL_DEVICE_H_ */
#endif /* __KERNEL__ */
#endif /* _FSL_DEVICE_H_ */
#endif /* __KERNEL__ */