diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
| commit | c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch) | |
| tree | bd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /arch/arm/common | |
| parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
| parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/locomo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 7c6b4b99a2df..2293f0ce061e 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
| @@ -1108,6 +1108,7 @@ void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf) | |||
| 1108 | locomo_writel(bpwf | LOCOMO_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS); | 1108 | locomo_writel(bpwf | LOCOMO_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS); |
| 1109 | spin_unlock_irqrestore(&lchip->lock, flags); | 1109 | spin_unlock_irqrestore(&lchip->lock, flags); |
| 1110 | } | 1110 | } |
| 1111 | EXPORT_SYMBOL(locomo_frontlight_set); | ||
| 1111 | 1112 | ||
| 1112 | /* | 1113 | /* |
| 1113 | * LoCoMo "Register Access Bus." | 1114 | * LoCoMo "Register Access Bus." |