diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 15:03:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 15:03:43 -0400 |
| commit | 949abd84cd54ff864efca9df822d1e02a56694ec (patch) | |
| tree | 0c0e7696a51e2989f11a37478ff26368cab0e227 /arch/arm/Makefile | |
| parent | b0958aed1ea39825439a7848544bfb2e267273b4 (diff) | |
| parent | cd07ecc828486e5887113c7dc4d9f9022145811b (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index b6b9f6ee467b..e8ab87750e9b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -138,6 +138,7 @@ machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | |||
| 138 | machine-$(CONFIG_ARCH_OMAP1) := omap1 | 138 | machine-$(CONFIG_ARCH_OMAP1) := omap1 |
| 139 | machine-$(CONFIG_ARCH_OMAP2) := omap2 | 139 | machine-$(CONFIG_ARCH_OMAP2) := omap2 |
| 140 | machine-$(CONFIG_ARCH_OMAP3) := omap2 | 140 | machine-$(CONFIG_ARCH_OMAP3) := omap2 |
| 141 | machine-$(CONFIG_ARCH_OMAP4) := omap2 | ||
| 141 | machine-$(CONFIG_ARCH_ORION5X) := orion5x | 142 | machine-$(CONFIG_ARCH_ORION5X) := orion5x |
| 142 | machine-$(CONFIG_ARCH_PNX4008) := pnx4008 | 143 | machine-$(CONFIG_ARCH_PNX4008) := pnx4008 |
| 143 | machine-$(CONFIG_ARCH_PXA) := pxa | 144 | machine-$(CONFIG_ARCH_PXA) := pxa |