diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-02 14:17:13 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-02 14:17:13 +0100 |
| commit | b21a207141d83a06abc5f492b80204602e02ca44 (patch) | |
| tree | f0152cde543008c72d7eb5c12c18095ad92785e6 /arch/sh/boards/mach-cayman/Makefile | |
| parent | uwb: remove beacon cache entry after calling uwb_notify() (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-b21a207141d83a06abc5f492b80204602e02ca44.tar.xz linux-b21a207141d83a06abc5f492b80204602e02ca44.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Conflicts:
drivers/uwb/wlp/eda.c
Diffstat (limited to 'arch/sh/boards/mach-cayman/Makefile')
| -rw-r--r-- | arch/sh/boards/mach-cayman/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-cayman/Makefile b/arch/sh/boards/mach-cayman/Makefile index 489a8f867368..cafe1ac3b29c 100644 --- a/arch/sh/boards/mach-cayman/Makefile +++ b/arch/sh/boards/mach-cayman/Makefile @@ -2,4 +2,3 @@ # Makefile for the Hitachi Cayman specific parts of the kernel # obj-y := setup.o irq.o -obj-$(CONFIG_HEARTBEAT) += led.o |