diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:43 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:43 -0500 |
| commit | 31bccbf39208133415000520c79ebe7b291786df (patch) | |
| tree | e03b799594ec22613ca2eb7382fc0a98e0cd4b0f /arch/arm/lib | |
| parent | e902be56cbf2a48d96d11d6884767e638d41c712 (diff) | |
| parent | 635f0258e5ae526034486b4ae9020e64bfb7d27e (diff) | |
Merge branch 'clps7500' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 30351cd4560d..866f84a586ff 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile | |||
| @@ -38,7 +38,6 @@ else | |||
| 38 | endif | 38 | endif |
| 39 | 39 | ||
| 40 | lib-$(CONFIG_ARCH_RPC) += ecard.o io-acorn.o floppydma.o | 40 | lib-$(CONFIG_ARCH_RPC) += ecard.o io-acorn.o floppydma.o |
| 41 | lib-$(CONFIG_ARCH_CLPS7500) += io-acorn.o | ||
| 42 | lib-$(CONFIG_ARCH_L7200) += io-acorn.o | 41 | lib-$(CONFIG_ARCH_L7200) += io-acorn.o |
| 43 | lib-$(CONFIG_ARCH_SHARK) += io-shark.o | 42 | lib-$(CONFIG_ARCH_SHARK) += io-shark.o |
| 44 | 43 | ||