mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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:
commit
0242909a61
365 changed files with 124 additions and 1746 deletions
|
|
@ -34,14 +34,14 @@ static char *serial_version = "$Revision: 1.25 $";
|
|||
#include <asm/system.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
|
||||
/* non-arch dependent serial structures are in linux/serial.h */
|
||||
#include <linux/serial.h>
|
||||
/* while we keep our own stuff (struct e100_serial) in a local .h file */
|
||||
#include "crisv10.h"
|
||||
#include <asm/fasttimer.h>
|
||||
#include <asm/arch/io_interface_mux.h>
|
||||
#include <arch/io_interface_mux.h>
|
||||
|
||||
#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
|
||||
#ifndef CONFIG_ETRAX_FAST_TIMER
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#include <linux/circ_buf.h>
|
||||
#include <asm/termios.h>
|
||||
#include <asm/dma.h>
|
||||
#include <asm/arch/io_interface_mux.h>
|
||||
#include <arch/io_interface_mux.h>
|
||||
|
||||
/* Software state per channel */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue