diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 12:51:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 12:51:51 -0400 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /drivers/net | |
| parent | 0a6d2fac615972142715d736289abeeb7382e81d (diff) | |
| parent | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff) | |
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris:
[CRIS] Move header files from include to arch/cris/include.
[CRISv32] Remove warning in io.h
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/cris/eth_v10.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 65d0a9103297..7e8a63106bdf 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
| @@ -32,14 +32,14 @@ | |||
| 32 | #include <linux/skbuff.h> | 32 | #include <linux/skbuff.h> |
| 33 | #include <linux/ethtool.h> | 33 | #include <linux/ethtool.h> |
| 34 | 34 | ||
| 35 | #include <asm/arch/svinto.h>/* DMA and register descriptions */ | 35 | #include <arch/svinto.h>/* DMA and register descriptions */ |
| 36 | #include <asm/io.h> /* CRIS_LED_* I/O functions */ | 36 | #include <asm/io.h> /* CRIS_LED_* I/O functions */ |
| 37 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
| 38 | #include <asm/dma.h> | 38 | #include <asm/dma.h> |
| 39 | #include <asm/system.h> | 39 | #include <asm/system.h> |
| 40 | #include <asm/ethernet.h> | 40 | #include <asm/ethernet.h> |
| 41 | #include <asm/cache.h> | 41 | #include <asm/cache.h> |
| 42 | #include <asm/arch/io_interface_mux.h> | 42 | #include <arch/io_interface_mux.h> |
| 43 | 43 | ||
| 44 | //#define ETHDEBUG | 44 | //#define ETHDEBUG |
| 45 | #define D(x) | 45 | #define D(x) |