git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: usb-audio: add support for Akai MPD16
[safe/jmp/linux-2.6]
/
include
/
linux
/
fs_enet_pd.h
diff --git
a/include/linux/fs_enet_pd.h
b/include/linux/fs_enet_pd.h
index
9bc045b
..
51b7934
100644
(file)
--- a/
include/linux/fs_enet_pd.h
+++ b/
include/linux/fs_enet_pd.h
@@
-17,6
+17,7
@@
#define FS_ENET_PD_H
#include <linux/string.h>
#define FS_ENET_PD_H
#include <linux/string.h>
+#include <linux/of_mdio.h>
#include <asm/types.h>
#define FS_ENET_NAME "fs_enet"
#include <asm/types.h>
#define FS_ENET_NAME "fs_enet"
@@
-103,10
+104,6
@@
struct fs_mii_bb_platform_info {
struct fs_mii_bit mdio_dir;
struct fs_mii_bit mdio_dat;
struct fs_mii_bit mdc_dat;
struct fs_mii_bit mdio_dir;
struct fs_mii_bit mdio_dat;
struct fs_mii_bit mdc_dat;
- int mdio_port; /* port & bit for MDIO */
- int mdio_bit;
- int mdc_port; /* port & bit for MDC */
- int mdc_bit;
int delay; /* delay in us */
int irq[32]; /* irqs per phy's */
};
int delay; /* delay in us */
int irq[32]; /* irqs per phy's */
};
@@
-134,14
+131,7
@@
struct fs_platform_info {
u32 device_flags;
u32 device_flags;
- int phy_addr; /* the phy address (-1 no phy) */
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
- char bus_id[16];
-#else
- const char* bus_id;
-#endif
- int phy_irq; /* the phy irq (if it exists) */
-
+ struct device_node *phy_node;
const struct fs_mii_bus_info *bus_info;
int rx_ring, tx_ring; /* number of buffers on rx */
const struct fs_mii_bus_info *bus_info;
int rx_ring, tx_ring; /* number of buffers on rx */