diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:56:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:56:29 -0500 |
| commit | 52fefcec97c25b15887e6a9a885ca54e7f7c0928 (patch) | |
| tree | 4898112a7fb30c20a9da3aefe9fdc7fdebda57a6 /arch/xtensa/platforms/iss/network.c | |
| parent | a0e280e0f33f6c859a235fb69a875ed8f3420388 (diff) | |
| parent | 5fee325e7d2bcbebf1cb38b4ff3a7aa3744c43e3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Update platform files to reflect new location of the header files.
xtensa: switch to packed struct unaligned access implementation
xtensa: Add xt2000 support files.
xtensa: move headers files to arch/xtensa/include
xtensa: use the new byteorder headers
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 64f057d89e7..edad4156d89 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 |