diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-02-02 20:56:07 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-02 20:56:07 -0500 |
| commit | d35b7a829a13b69c4747b69380b504b6544a2375 (patch) | |
| tree | 112749ea0adac0fd634849f8c710dc2a364f671e /arch/arm/Makefile | |
| parent | 28db4ed52d329ca06da9fbcc9dcf6c4e25cdcac2 (diff) | |
| parent | 84c9b7271a0af08c4e5fce3901a0ad3d952036bc (diff) | |
ARM: Merge next-samsung-s3c244x-merge
Merge branch 'next-samsung-s3c244x-merge' into next-samsung
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 bbcd512ccf7e..893bcfc77708 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -158,7 +158,7 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 | |||
| 158 | machine-$(CONFIG_ARCH_PXA) := pxa | 158 | machine-$(CONFIG_ARCH_PXA) := pxa |
| 159 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 159 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
| 160 | machine-$(CONFIG_ARCH_RPC) := rpc | 160 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 161 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | 161 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443 |
| 162 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | 162 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 |
| 163 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 | 163 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 |
| 164 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | 164 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 |