diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-22 04:52:26 -0400 |
---|---|---|
committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-22 04:52:26 -0400 |
commit | 522c37b9d3bc2554264c2d7cbba439571a2043fb (patch) | |
tree | b8c50d98ba54eed8877de360268aaccd3a2ea552 /arch/arm/common/sa1111.c | |
parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) |
[PATCH] ARM: Fix sa1111.c build error caused by klist changes
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common/sa1111.c')
-rw-r--r-- | arch/arm/common/sa1111.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 21fce3414ed1..38c2eb667eb9 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
@@ -721,16 +721,17 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) | |||
721 | return ret; | 721 | return ret; |
722 | } | 722 | } |
723 | 723 | ||
724 | static int sa1111_remove_one(struct device *dev, void *data) | ||
725 | { | ||
726 | device_unregister(dev); | ||
727 | return 0; | ||
728 | } | ||
729 | |||
724 | static void __sa1111_remove(struct sa1111 *sachip) | 730 | static void __sa1111_remove(struct sa1111 *sachip) |
725 | { | 731 | { |
726 | struct list_head *l, *n; | ||
727 | void __iomem *irqbase = sachip->base + SA1111_INTC; | 732 | void __iomem *irqbase = sachip->base + SA1111_INTC; |
728 | 733 | ||
729 | list_for_each_safe(l, n, &sachip->dev->children) { | 734 | device_for_each_child(sachip->dev, NULL, sa1111_remove_one); |
730 | struct device *d = list_to_dev(l); | ||
731 | |||
732 | device_unregister(d); | ||
733 | } | ||
734 | 735 | ||
735 | /* disable all IRQs */ | 736 | /* disable all IRQs */ |
736 | sa1111_writel(0, irqbase + SA1111_INTEN0); | 737 | sa1111_writel(0, irqbase + SA1111_INTEN0); |