diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-01-08 11:05:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 11:05:59 -0800 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /arch/xtensa/platforms/iss/network.c | |
| parent | r6040: bump release number to 0.20 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-dev-7f46b1343f723f98634a5dcee47856b2000079ed.tar.xz linux-dev-7f46b1343f723f98634a5dcee47856b2000079ed.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 @@ /* * - * arch/xtensa/platform-iss/network.c + * arch/xtensa/platforms/iss/network.c * * Platform specific initialization. * @@ -33,7 +33,7 @@ #include <linux/rtnetlink.h> #include <linux/platform_device.h> -#include <asm/platform/simcall.h> +#include <platform/simcall.h> #define DRIVER_NAME "iss-netdev" #define ETH_MAX_PACKET 1500 |