diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 03:49:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 03:49:25 -0400 |
| commit | a3685f00652af83f12b63e3b4ef48f29581ba48b (patch) | |
| tree | 18ec9eed3deabf3c6b9bec206765a4dd0d8cf9ec /arch/arm/Makefile | |
| parent | b12f3cbd7a9a869eae1eb108da02526b132ba80b (diff) | |
| parent | 63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc (diff) | |
Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
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 3e312ec8e624..7cdaf5afcee6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -161,7 +161,7 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 | |||
| 161 | machine-$(CONFIG_ARCH_PXA) := pxa | 161 | machine-$(CONFIG_ARCH_PXA) := pxa |
| 162 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 162 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
| 163 | machine-$(CONFIG_ARCH_RPC) := rpc | 163 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 164 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443 | 164 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443 |
| 165 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | 165 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 |
| 166 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx | 166 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx |
| 167 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | 167 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 |