diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /arch/xtensa/platforms/iss/network.c | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'arch/xtensa/platforms/iss/network.c')
| -rw-r--r-- | arch/xtensa/platforms/iss/network.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c index 64f057d89e73..edad4156d89a 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * | 2 | * |
| 3 | * arch/xtensa/platform-iss/network.c | 3 | * arch/xtensa/platforms/iss/network.c |
| 4 | * | 4 | * |
| 5 | * Platform specific initialization. | 5 | * Platform specific initialization. |
| 6 | * | 6 | * |
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <linux/rtnetlink.h> | 33 | #include <linux/rtnetlink.h> |
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | 35 | ||
| 36 | #include <asm/platform/simcall.h> | 36 | #include <platform/simcall.h> |
| 37 | 37 | ||
| 38 | #define DRIVER_NAME "iss-netdev" | 38 | #define DRIVER_NAME "iss-netdev" |
| 39 | #define ETH_MAX_PACKET 1500 | 39 | #define ETH_MAX_PACKET 1500 |