diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-04 21:34:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-04 21:34:13 -0400 |
| commit | 048c9acca90ca7da42b92745445fe008a48add88 (patch) | |
| tree | e2e551a565a7dcdca0fc398aa659231745e5a901 /arch/sparc/kernel/Makefile | |
| parent | 07df841877195765d958df146f614fc7bdedd5e3 (diff) | |
| parent | ad348cc5349be4ef4abe08819afbb63386585413 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Merge sparc bug fixes that didn't make it into v3.9 into
sparc-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/Makefile')
| -rw-r--r-- | arch/sparc/kernel/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index d2936d0600bd..d432fb20358e 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile | |||
| @@ -103,9 +103,6 @@ obj-$(CONFIG_PCI_MSI) += pci_msi.o | |||
| 103 | 103 | ||
| 104 | obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o | 104 | obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o |
| 105 | 105 | ||
| 106 | # sparc64 cpufreq | ||
| 107 | obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o | ||
| 108 | obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o | ||
| 109 | obj-$(CONFIG_US3_MC) += chmc.o | 106 | obj-$(CONFIG_US3_MC) += chmc.o |
| 110 | 107 | ||
| 111 | obj-$(CONFIG_KPROBES) += kprobes.o | 108 | obj-$(CONFIG_KPROBES) += kprobes.o |