diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-02-03 06:05:49 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-02-04 08:15:27 -0500 |
| commit | c7d1623e5820c46a39519e64fafb94f39419be82 (patch) | |
| tree | b7374d7e14b6277f06df911ceaa0554545c0c8b7 /arch/arm/mach-ixp4xx/Makefile | |
| parent | 0929ac3ea4c0bece16b0c5c5365181fa45fbf582 (diff) | |
[ARM] 4808/2: ixp4xx: Merge nas100d-power.c into nas100d-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 4fc7316191e9..a7880aba3fa7 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile | |||
| @@ -24,7 +24,7 @@ obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o | |||
| 24 | obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o | 24 | obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o |
| 25 | obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o | 25 | obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o |
| 26 | obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o | 26 | obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o |
| 27 | obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o | 27 | obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o |
| 28 | obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o | 28 | obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o |
| 29 | obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o | 29 | obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o |
| 30 | obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o | 30 | obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o |