diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-02-03 12:05:55 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-02-04 13:15:27 +0000 |
| commit | 43816bcb72623c02a992e513feeaaf1178cea6dc (patch) | |
| tree | ec6925c641f56dd3e20209c20e17f6950ec3c7c4 /arch/arm/mach-ixp4xx/Makefile | |
| parent | c7d1623e5820c46a39519e64fafb94f39419be82 (diff) | |
| download | linux-stable-43816bcb72623c02a992e513feeaaf1178cea6dc.tar.gz linux-stable-43816bcb72623c02a992e513feeaaf1178cea6dc.tar.bz2 linux-stable-43816bcb72623c02a992e513feeaaf1178cea6dc.zip | |
[ARM] 4809/2: ixp4xx: Merge dsmg600-power.c into dsmg600-setup.c
There is no reason to have power control in a separate file from the
board setup code. Merge it back into the board setup file and remove
superfluous header includes.
--
Signed-off-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx/Makefile')
| -rw-r--r-- | arch/arm/mach-ixp4xx/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile index a7880aba3fa7..c1956882c48b 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o -obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o +obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o |