diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/xtensa/platform-iss/network.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/xtensa/platform-iss/network.c')
| -rw-r--r-- | arch/xtensa/platform-iss/network.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c index 15d64414bd60..8ebfc8761229 100644 --- a/arch/xtensa/platform-iss/network.c +++ b/arch/xtensa/platform-iss/network.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <linux/timer.h> | 34 | #include <linux/timer.h> |
| 35 | #include <linux/platform_device.h> | 35 | #include <linux/platform_device.h> |
| 36 | 36 | ||
| 37 | #include <xtensa/simcall.h> | 37 | #include <asm/platform/simcall.h> |
| 38 | 38 | ||
| 39 | #define DRIVER_NAME "iss-netdev" | 39 | #define DRIVER_NAME "iss-netdev" |
| 40 | #define ETH_MAX_PACKET 1500 | 40 | #define ETH_MAX_PACKET 1500 |