git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
blackfin
/
include
/
asm
/
reboot.h
diff --git
a/arch/blackfin/include/asm/reboot.h
b/arch/blackfin/include/asm/reboot.h
index 4856d62b7467af1bccad5a3817e5fa2cfc421dfb..ae1e36329bec7c71af865d8790eb2ff3a4e29af0 100644
(file)
--- a/
arch/blackfin/include/asm/reboot.h
+++ b/
arch/blackfin/include/asm/reboot.h
@@
-15,6
+15,6
@@
extern void native_machine_halt(void);
extern void native_machine_power_off(void);
/* common reboot workarounds */
-extern void bfin_
gpio_reset_spi0_ssel1(void
);
+extern void bfin_
reset_boot_spi_cs(unsigned short pin
);
#endif