diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-08-29 09:46:30 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-08-29 09:46:30 +0200 |
| commit | 6ad30ce046aefbdc3848232c665a728860d7bb68 (patch) | |
| tree | 34af8fc78b28281fcfe531a26401b440c078038e /arch/openrisc/kernel/setup.c | |
| parent | 0351c287952483dafa904f84496631198465fbf4 (diff) | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
| download | op-kernel-dev-6ad30ce046aefbdc3848232c665a728860d7bb68.zip op-kernel-dev-6ad30ce046aefbdc3848232c665a728860d7bb68.tar.gz | |
Merge tag 'v3.11-rc7' into devel
Merged in this to avoid conflicts with the big locking fixes
from upstream.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Conflicts:
drivers/pinctrl/pinctrl-sunxi.c
Diffstat (limited to 'arch/openrisc/kernel/setup.c')
| -rw-r--r-- | arch/openrisc/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index f4d5bed..d7359ff 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c @@ -267,7 +267,7 @@ void __init detect_unit_config(unsigned long upr, unsigned long mask, * */ -void __cpuinit calibrate_delay(void) +void calibrate_delay(void) { const int *val; struct device_node *cpu = NULL; |
