diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
| commit | 9a21247181d93fdf99255911845ecdb041d21583 (patch) | |
| tree | 6d69be36f8a2bd8c76bf02ead2f0121a511c0a92 /arch/arm/mach-ixp4xx/nas100d-power.c | |
| parent | c752666c17f870fa8ae9f16804dd457e9e6daaec (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-power.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-power.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c index 2bec69bfa715..99d333d7ebdd 100644 --- a/arch/arm/mach-ixp4xx/nas100d-power.c +++ b/arch/arm/mach-ixp4xx/nas100d-power.c | |||
| @@ -56,6 +56,9 @@ static int __init nas100d_power_init(void) | |||
| 56 | 56 | ||
| 57 | static void __exit nas100d_power_exit(void) | 57 | static void __exit nas100d_power_exit(void) |
| 58 | { | 58 | { |
| 59 | if (!(machine_is_nas100d())) | ||
| 60 | return; | ||
| 61 | |||
| 59 | free_irq(NAS100D_RB_IRQ, NULL); | 62 | free_irq(NAS100D_RB_IRQ, NULL); |
| 60 | } | 63 | } |
| 61 | 64 | ||