diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 18:45:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 18:45:29 -0700 |
| commit | 79ff1ad2eec1c106962241f6346958b9641e34f3 (patch) | |
| tree | ec54059a4e9939c0d842ab7fdc77e324ed8fa0f6 /arch/powerpc/kernel/legacy_serial.c | |
| parent | 821b03ffac8851d6bc1d5530183d2ed25adae35d (diff) | |
| parent | 781c74b1e660d045c2e380b4ada02534f415685c (diff) | |
| download | kernel_samsung_smdk4412-79ff1ad2eec1c106962241f6346958b9641e34f3.zip kernel_samsung_smdk4412-79ff1ad2eec1c106962241f6346958b9641e34f3.tar.gz kernel_samsung_smdk4412-79ff1ad2eec1c106962241f6346958b9641e34f3.tar.bz2 | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc/mpc5200: Fix lite5200b suspend/resume
powerpc/legacy_serial: Bail if reg-offset/shift properties are present
powerpc/bootwrapper: update for initrd with simpleImage
Diffstat (limited to 'arch/powerpc/kernel/legacy_serial.c')
| -rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 61dd174..cf37f5c 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c @@ -136,6 +136,11 @@ static int __init add_legacy_soc_port(struct device_node *np, if (of_get_property(np, "clock-frequency", NULL) == NULL) return -1; + /* if reg-shift or offset, don't try to use it */ + if ((of_get_property(np, "reg-shift", NULL) != NULL) || + (of_get_property(np, "reg-offset", NULL) != NULL)) + return -1; + /* if rtas uses this device, don't try to use it as well */ if (of_get_property(np, "used-by-rtas", NULL) != NULL) return -1; |