diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-08 11:41:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-08 11:41:10 -0700 |
| commit | 69849375d6b13e94d08cdc94b49b11fbab454a0e (patch) | |
| tree | b207e157d9c82b6d328275c1c7d921ef4a584caf | |
| parent | 392eaef2e9f8e6527043ad8422d9cfea59ee6fb0 (diff) | |
| parent | 8806048878fce541afe1d72cd2320f092519f90a (diff) | |
| download | lwn-69849375d6b13e94d08cdc94b49b11fbab454a0e.tar.gz lwn-69849375d6b13e94d08cdc94b49b11fbab454a0e.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur
| -rw-r--r-- | arch/mips/sibyte/swarm/platform.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/sibyte/swarm/platform.c b/arch/mips/sibyte/swarm/platform.c index dd0e5b9b64e8..54847fe1e564 100644 --- a/arch/mips/sibyte/swarm/platform.c +++ b/arch/mips/sibyte/swarm/platform.c @@ -9,6 +9,8 @@ #include <asm/sibyte/sb1250_genbus.h> #include <asm/sibyte/sb1250_regs.h> +#if defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_LITTLESUR) + #define DRV_NAME "pata-swarm" #define SWARM_IDE_SHIFT 5 @@ -79,3 +81,5 @@ static int __init swarm_pata_init(void) } device_initcall(swarm_pata_init); + +#endif /* defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_LITTLESUR) */ |