git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638
[pandora-kernel.git]
/
include
/
linux
/
fec.h
diff --git
a/include/linux/fec.h
b/include/linux/fec.h
index
5d3523d
..
bcff455
100644
(file)
--- a/
include/linux/fec.h
+++ b/
include/linux/fec.h
@@
-3,6
+3,8
@@
* Copyright (c) 2009 Orex Computed Radiography
* Baruch Siach <baruch@tkos.co.il>
*
* Copyright (c) 2009 Orex Computed Radiography
* Baruch Siach <baruch@tkos.co.il>
*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc.
+ *
* Header file for the FEC platform data
*
* This program is free software; you can redistribute it and/or modify
* Header file for the FEC platform data
*
* This program is free software; you can redistribute it and/or modify
@@
-16,6
+18,7
@@
struct fec_platform_data {
phy_interface_t phy;
struct fec_platform_data {
phy_interface_t phy;
+ unsigned char mac[ETH_ALEN];
};
#endif
};
#endif