diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 21:05:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 21:05:17 -0700 |
| commit | 4d15393d20c1934a296a999d8ede125532d21cc4 (patch) | |
| tree | a1ad6f5314857c1d9dfd4ba981003c2853b8027f /arch/sparc/include/asm/parport.h | |
| parent | 7fbd15f9b42f2c30ceeb94776a111d0c28669e0c (diff) | |
| parent | 2dc4ec5de039d5db4805dff170ab80f4e990e977 (diff) | |
| download | blackbird-op-linux-4d15393d20c1934a296a999d8ede125532d21cc4.tar.gz blackbird-op-linux-4d15393d20c1934a296a999d8ede125532d21cc4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Update defconfig.
sparc: Kill user copy check code.
sparc64: Fix perf_arch_get_caller_regs().
sparc64: Add missing ID to parport probing code.
Diffstat (limited to 'arch/sparc/include/asm/parport.h')
| -rw-r--r-- | arch/sparc/include/asm/parport.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h index 4f7afa01b2ae..aa4c82648d88 100644 --- a/arch/sparc/include/asm/parport.h +++ b/arch/sparc/include/asm/parport.h @@ -228,6 +228,10 @@ static const struct of_device_id ecpp_match[] = { .name = "parallel", .compatible = "ns87317-ecpp", }, + { + .name = "parallel", + .compatible = "pnpALI,1533,3", + }, {}, }; |
