diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-28 00:14:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-28 00:14:48 -0400 |
| commit | c2e1ff39c106ab026e3feb29c038855b7ed00393 (patch) | |
| tree | e0255b5b9aed8645edc4426f2d4972280910e065 /arch/arm/mach-shmobile/Makefile | |
| parent | 456d3d42460c1fc20ba0d27442443fcd63aaac35 (diff) | |
| parent | b48b2c3e50433ff6f7e46186daa7f986bd960215 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pull in Linus's tree to get the commits that blew away
ARCH_USES_GETTIMEOFFSET but didn't update Sparc correctly, so
that I can apply Stephen Rothwell's fix for that mis-merge.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index e6b177bc9410..8aa1962c22a2 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Common objects | 5 | # Common objects |
| 6 | obj-y := timer.o console.o clock.o | 6 | obj-y := timer.o console.o clock.o common.o |
| 7 | 7 | ||
| 8 | # CPU objects | 8 | # CPU objects |
| 9 | obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o intc-sh7367.o | 9 | obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o intc-sh7367.o |