diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /arch/h8300/platform/h8300h/aki3068net/Makefile | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'arch/h8300/platform/h8300h/aki3068net/Makefile')
| -rw-r--r-- | arch/h8300/platform/h8300h/aki3068net/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/h8300/platform/h8300h/aki3068net/Makefile b/arch/h8300/platform/h8300h/aki3068net/Makefile index b03c328f8c70..b7ff78050b7f 100644 --- a/arch/h8300/platform/h8300h/aki3068net/Makefile +++ b/arch/h8300/platform/h8300h/aki3068net/Makefile | |||
| @@ -3,4 +3,3 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | extra-y := crt0_ram.o | 5 | extra-y := crt0_ram.o |
| 6 | obj-y := timer.o | ||