diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /arch/openrisc/lib/delay.c | |
parent | ALSA: hdsp - Remove obsolete settings functions (diff) | |
parent | ALSA: hda - Add Conexant CX20755/20756/20757 codec IDs (diff) | |
download | linux-dev-e152f18027552eb34006b35347e72bc805783027.tar.xz linux-dev-e152f18027552eb34006b35347e72bc805783027.zip |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
Diffstat (limited to 'arch/openrisc/lib/delay.c')
-rw-r--r-- | arch/openrisc/lib/delay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/lib/delay.c b/arch/openrisc/lib/delay.c index c330767c9217..c82b09f4a106 100644 --- a/arch/openrisc/lib/delay.c +++ b/arch/openrisc/lib/delay.c @@ -22,7 +22,7 @@ #include <asm/timex.h> #include <asm/processor.h> -int __devinit read_current_timer(unsigned long *timer_value) +int read_current_timer(unsigned long *timer_value) { *timer_value = mfspr(SPR_TTCR); return 0; |