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
includecheck fix: include/linux, rfkill.h
[safe/jmp/linux-2.6]
/
include
/
linux
/
mv643xx_eth.h
diff --git
a/include/linux/mv643xx_eth.h
b/include/linux/mv643xx_eth.h
index
12339eb
..
cbbbe9b
100644
(file)
--- a/
include/linux/mv643xx_eth.h
+++ b/
include/linux/mv643xx_eth.h
@@
-21,6
+21,10
@@
struct mv643xx_eth_shared_platform_data {
unsigned int t_clk;
};
unsigned int t_clk;
};
+#define MV643XX_ETH_PHY_ADDR_DEFAULT 0
+#define MV643XX_ETH_PHY_ADDR(x) (0x80 | (x))
+#define MV643XX_ETH_PHY_NONE 0xff
+
struct mv643xx_eth_platform_data {
/*
* Pointer back to our parent instance, and our port number.
struct mv643xx_eth_platform_data {
/*
* Pointer back to our parent instance, and our port number.
@@
-31,7
+35,6
@@
struct mv643xx_eth_platform_data {
/*
* Whether a PHY is present, and if yes, at which address.
*/
/*
* Whether a PHY is present, and if yes, at which address.
*/
- int force_phy_addr;
int phy_addr;
/*
int phy_addr;
/*