diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 02:32:18 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 02:33:14 -0500 |
| commit | f19693a17c6705e197eb24d4618060eaac1b535c (patch) | |
| tree | fc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd /arch/mips/Kbuild.platforms | |
| parent | 23b120cdfae4f5c29da69de750d545bad719ead4 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
Conflicts:
arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips/Kbuild.platforms')
| -rw-r--r-- | arch/mips/Kbuild.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms index 78439b8a83c..7ff9b549204 100644 --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | platforms += alchemy | 3 | platforms += alchemy |
| 4 | platforms += ar7 | 4 | platforms += ar7 |
| 5 | platforms += ath79 | ||
| 5 | platforms += bcm47xx | 6 | platforms += bcm47xx |
| 6 | platforms += bcm63xx | 7 | platforms += bcm63xx |
| 7 | platforms += cavium-octeon | 8 | platforms += cavium-octeon |