git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'remove-h8300' of git://git.infradead.org/users/hch/misc into asm-generic
[sfrench/cifs-2.6.git]
/
drivers
/
clk
/
Makefile
diff --git
a/drivers/clk/Makefile
b/drivers/clk/Makefile
index 2bd5ffd595bf3d42ad61b8cdbcdaf594b9ae5d2f..21cb96b022e61bcddd229042794b93e761d4ab55 100644
(file)
--- a/
drivers/clk/Makefile
+++ b/
drivers/clk/Makefile
@@
-85,7
+85,6
@@
obj-$(CONFIG_CLK_BAIKAL_T1) += baikal-t1/
obj-y += bcm/
obj-$(CONFIG_ARCH_BERLIN) += berlin/
obj-$(CONFIG_ARCH_DAVINCI) += davinci/
-obj-$(CONFIG_H8300) += h8300/
obj-$(CONFIG_ARCH_HISI) += hisilicon/
obj-y += imgtec/
obj-y += imx/