Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 279995
b: refs/heads/master
c: e684937
h: refs/heads/master
i:
  279993: 37e736b
  279991: 209260f
v: v3
  • Loading branch information
Russell King committed Jan 5, 2012
1 parent ea8b3a8 commit e75029a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 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: d9eedaf329a28a20a4b0f18fed2beb40be10a406
refs/heads/master: e6849374f3fcec5a51ab6df40ae4d8034ba1c5e0
2 changes: 0 additions & 2 deletions trunk/arch/arm/mach-lpc32xx/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,6 @@ void lpc23xx_restart(char mode, const char *cmd)
switch (mode) {
case 's':
case 'h':
printk(KERN_CRIT "RESET: Rebooting system\n");

lpc32xx_watchdog_reset();
break;

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/mach-u300/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1897,7 +1897,6 @@ void u300_restart(char mode, const char *cmd)
switch (mode) {
case 's':
case 'h':
printk(KERN_CRIT "RESET: shutting down/rebooting system\n");
#ifdef CONFIG_COH901327_WATCHDOG
coh901327_watchdog_reset();
#endif
Expand Down

0 comments on commit e75029a

Please sign in to comment.