diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 18:04:15 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 18:05:20 -0500 |
| commit | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (patch) | |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 /drivers/net/dsa/mv88e6131.c | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc
There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9g45.c
Diffstat (limited to 'drivers/net/dsa/mv88e6131.c')
| -rw-r--r-- | drivers/net/dsa/mv88e6131.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c index e0eb68243834..55888b06d8b4 100644 --- a/drivers/net/dsa/mv88e6131.c +++ b/drivers/net/dsa/mv88e6131.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/list.h> | 11 | #include <linux/list.h> |
| 12 | #include <linux/module.h> | ||
| 12 | #include <linux/netdevice.h> | 13 | #include <linux/netdevice.h> |
| 13 | #include <linux/phy.h> | 14 | #include <linux/phy.h> |
| 14 | #include <net/dsa.h> | 15 | #include <net/dsa.h> |