Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38892
b: refs/heads/master
c: 5b34821
h: refs/heads/master
v: v3
  • Loading branch information
Haavard Skinnemoen authored and Linus Torvalds committed Oct 4, 2006
1 parent 6bcfc50 commit aba29c3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 126 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fefd26b3b8597a11a422d950c0d4424ff33a70ad
refs/heads/master: 5b34821a601ea079184efba2f9c7c7af61241bde
3 changes: 2 additions & 1 deletion trunk/drivers/serial/at91_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@

#include <asm/io.h>

#include <asm/arch/at91rm9200_usart.h>
#include <asm/arch/at91rm9200_pdc.h>
#include <asm/mach/serial_at91.h>
#include <asm/arch/board.h>
#include <asm/arch/system.h>
#include <asm/arch/gpio.h>

#include "atmel_serial.h"

#if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#endif
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91rm9200_usart.h
* drivers/serial/atmel_serial.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
Expand Down
123 changes: 0 additions & 123 deletions trunk/include/asm-avr32/arch-at32ap/at91rm9200_usart.h

This file was deleted.

0 comments on commit aba29c3

Please sign in to comment.