Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 339718
b: refs/heads/master
c: f0995d0
h: refs/heads/master
v: v3
  • Loading branch information
Jean-Christophe PLAGNIOL-VILLARD committed Nov 6, 2012
1 parent 912a7b3 commit 393a8c2
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 9 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: ffe5cd8e3a5b0b6e13d3f51d3abab5715df75ff0
refs/heads/master: f0995d089e46b3ee03acc13d2a3380d90c573381
File renamed without changes.
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91sam9260.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
#include <mach/at91_dbgu.h>
#include <mach/at91sam9260.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>

#include "at91_aic.h"
#include "at91_rstc.h"
#include "soc.h"
#include "generic.h"
#include "clock.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91sam9261.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include <mach/cpu.h>
#include <mach/at91sam9261.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>

#include "at91_aic.h"
#include "at91_rstc.h"
#include "soc.h"
#include "generic.h"
#include "clock.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91sam9263.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <asm/system_misc.h>
#include <mach/at91sam9263.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>

#include "at91_aic.h"
#include "at91_rstc.h"
#include "soc.h"
#include "generic.h"
#include "clock.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91sam9_alt_reset.S
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <linux/linkage.h>
#include <mach/hardware.h>
#include <mach/at91_ramc.h>
#include <mach/at91_rstc.h>
#include "at91_rstc.h"

.arm

Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/arm/mach-at91/at91sam9g45_reset.S
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
#include <linux/linkage.h>
#include <mach/hardware.h>
#include <mach/at91_ramc.h>
#include <mach/at91_rstc.h>

#include "at91_rstc.h"
.arm

.globl at91sam9g45_restart
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/at91sam9rl.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include <mach/at91_dbgu.h>
#include <mach/at91sam9rl.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>

#include "at91_aic.h"
#include "at91_rstc.h"
#include "soc.h"
#include "generic.h"
#include "clock.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-at91/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* Show the reason for the previous system reset.
*/

#include <mach/at91_rstc.h>
#include "at91_rstc.h"
#include "at91_shdwc.h"

static void __init show_reset_status(void)
Expand Down

0 comments on commit 393a8c2

Please sign in to comment.