diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:11 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:11 -0400 |
| commit | 32457942b90aabb9242b450f02d18d9c8d982916 (patch) | |
| tree | 6472b77016f83f2ada7a7e2ca83a9803f313f1a8 /arch/arm/Makefile | |
| parent | 6071399674e813d797d9f458ec8913b86c85398e (diff) | |
| parent | f64bea4318a73e833d0a9b8400cc0f6cee957da3 (diff) | |
ARM: Merge for-2635/fb-updates1
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index eddcbba87c67..9505a70bfc0a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -162,7 +162,7 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 | |||
| 162 | machine-$(CONFIG_ARCH_PXA) := pxa | 162 | machine-$(CONFIG_ARCH_PXA) := pxa |
| 163 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 163 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
| 164 | machine-$(CONFIG_ARCH_RPC) := rpc | 164 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 165 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443 | 165 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443 |
| 166 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | 166 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 |
| 167 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx | 167 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx |
| 168 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | 168 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 |