diff options
| author |   James Morris <jmorris@namei.org> | 2011-03-08 10:55:06 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-08 10:55:06 +1100 |
| commit | 1cc26bada9f6807814806db2f0d78792eecdac71 (patch) | |
| tree | 5509b5139db04af6c13db0a580c84116a4a54039 /arch/microblaze/Makefile | |
| parent | TOMOYO: Fix memory leak upon file open. (diff) | |
| parent | Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 (diff) | |
| download | linux-dev-1cc26bada9f6807814806db2f0d78792eecdac71.tar.xz linux-dev-1cc26bada9f6807814806db2f0d78792eecdac71.zip | |
Merge branch 'master'; commit 'v2.6.38-rc7' into next
Diffstat (limited to '')
| -rw-r--r-- | arch/microblaze/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 15f1f1d1840d..6f432e6df9af 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -17,7 +17,7 @@ export CPU_VER CPU_MAJOR CPU_MINOR CPU_REV # The various CONFIG_XILINX cpu features options are integers 0/1/2... # rather than bools y/n -# Work out HW multipler support. This is icky. +# Work out HW multipler support. This is tricky. # 1. Spartan2 has no HW multiplers. # 2. MicroBlaze v3.x always uses them, except in Spartan 2 # 3. All other FPGa/CPU ver combos, we can trust the CONFIG_ settings |