diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
| commit | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (patch) | |
| tree | 35b9ab361651f649d3c9aa69f159812eba50d154 /arch/m68knommu/Makefile | |
| parent | dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db (diff) | |
| parent | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'arch/m68knommu/Makefile')
| -rw-r--r-- | arch/m68knommu/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile index b63bbcf874ff..fd0fb303d885 100644 --- a/arch/m68knommu/Makefile +++ b/arch/m68knommu/Makefile | |||
| @@ -41,7 +41,6 @@ board-$(CONFIG_M5271EVB) := M5271EVB | |||
| 41 | board-$(CONFIG_M5275EVB) := M5275EVB | 41 | board-$(CONFIG_M5275EVB) := M5275EVB |
| 42 | board-$(CONFIG_M5282EVB) := M5282EVB | 42 | board-$(CONFIG_M5282EVB) := M5282EVB |
| 43 | board-$(CONFIG_ELITE) := eLITE | 43 | board-$(CONFIG_ELITE) := eLITE |
| 44 | board-$(CONFIG_eLIA) := eLIA | ||
| 45 | board-$(CONFIG_NETtel) := NETtel | 44 | board-$(CONFIG_NETtel) := NETtel |
| 46 | board-$(CONFIG_SECUREEDGEMP3) := MP3 | 45 | board-$(CONFIG_SECUREEDGEMP3) := MP3 |
| 47 | board-$(CONFIG_CLEOPATRA) := CLEOPATRA | 46 | board-$(CONFIG_CLEOPATRA) := CLEOPATRA |