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
This commit is contained in:
Linus Torvalds 2008-11-01 09:51:51 -07:00
commit 0242909a61
365 changed files with 124 additions and 1746 deletions

View file

@ -32,14 +32,14 @@
#include <linux/skbuff.h>
#include <linux/ethtool.h>
#include <asm/arch/svinto.h>/* DMA and register descriptions */
#include <arch/svinto.h>/* DMA and register descriptions */
#include <asm/io.h> /* CRIS_LED_* I/O functions */
#include <asm/irq.h>
#include <asm/dma.h>
#include <asm/system.h>
#include <asm/ethernet.h>
#include <asm/cache.h>
#include <asm/arch/io_interface_mux.h>
#include <arch/io_interface_mux.h>
//#define ETHDEBUG
#define D(x)