diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 17:02:27 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 17:02:27 +0400 |
| commit | b3fecf8cab6441527ab057c99d7e6a6d7f6713e5 (patch) | |
| tree | d327499840a25fbd1f81e49d5cb6769bdad382f5 /arch/mips/jazz/Makefile | |
| parent | 5b62efd8250d6a751c31d1972e96bfccd19c4679 (diff) | |
| parent | 83a44ac8bf4a8e6cbbf0c00ff281a482778f708a (diff) | |
| download | linux-b3fecf8cab6441527ab057c99d7e6a6d7f6713e5.tar.xz | |
Merge branch 'for-3.10/hid-driver-transport-cleanups' into for-3.10/mt-hybrid-finger-pen
Diffstat (limited to 'arch/mips/jazz/Makefile')
| -rw-r--r-- | arch/mips/jazz/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile index dd9d99bfcf7a..624b0ee3e5d4 100644 --- a/arch/mips/jazz/Makefile +++ b/arch/mips/jazz/Makefile @@ -2,4 +2,4 @@ # Makefile for the Jazz family specific parts of the kernel # -obj-y := irq.o jazzdma.o reset.o setup.o +obj-y := irq.o jazzdma.o reset.o setup.o |