diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/sh/boards/mach-highlander/Makefile | |
| parent | f17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/sh/boards/mach-highlander/Makefile')
| -rw-r--r-- | arch/sh/boards/mach-highlander/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/boards/mach-highlander/Makefile b/arch/sh/boards/mach-highlander/Makefile index 20a10080b11f..d93aaf880134 100644 --- a/arch/sh/boards/mach-highlander/Makefile +++ b/arch/sh/boards/mach-highlander/Makefile | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the R7780RP-1 specific parts of the kernel | 2 | # Makefile for the Highlander specific parts of the kernel |
| 3 | # | 3 | # |
| 4 | irqinit-$(CONFIG_SH_R7780MP) := irq-r7780mp.o | 4 | obj-y := setup.o |
| 5 | irqinit-$(CONFIG_SH_R7785RP) := irq-r7785rp.o | 5 | obj-$(CONFIG_SH_R7780RP) += irq-r7780rp.o |
| 6 | irqinit-$(CONFIG_SH_R7780RP) := irq-r7780rp.o | 6 | obj-$(CONFIG_SH_R7780MP) += irq-r7780mp.o |
| 7 | obj-y := setup.o $(irqinit-y) | 7 | obj-$(CONFIG_SH_R7785RP) += irq-r7785rp.o pinmux-r7785rp.o |
| 8 | 8 | ||
| 9 | ifneq ($(CONFIG_SH_R7785RP),y) | 9 | ifneq ($(CONFIG_SH_R7785RP),y) |
| 10 | obj-$(CONFIG_PUSH_SWITCH) += psw.o | 10 | obj-$(CONFIG_PUSH_SWITCH) += psw.o |