projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'samsung/exynos-multiplatform' into next/drivers
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
plat-samsung
/
Makefile
diff --git
a/arch/arm/plat-samsung/Makefile
b/arch/arm/plat-samsung/Makefile
index f38ce8489dfde1fd014c7ba7af918caf2ad1304b..a23c460299a19bc003dd73003aa5e1e04605a24f 100644
(file)
--- a/
arch/arm/plat-samsung/Makefile
+++ b/
arch/arm/plat-samsung/Makefile
@@
-4,9
+4,6
@@
#
# Licensed under GPLv2
#
# Licensed under GPLv2
-ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include
-ccflags-$(CONFIG_ARCH_EXYNOS) += -I$(srctree)/arch/arm/mach-exynos/include
-
obj-y :=
obj-m :=
obj-n := dummy.o
obj-y :=
obj-m :=
obj-n := dummy.o
@@
-36,7
+33,7
@@
obj-$(CONFIG_S3C_ADC) += adc.o
obj-y += platformdata.o
obj-y += platformdata.o
-obj-
$(CONFIG_PLAT_SAMSUNG_SINGLE)
+= devs.o
+obj-
y
+= devs.o
obj-y += dev-uart.o
obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o
obj-$(CONFIG_S5P_DEV_UART) += s5p-dev-uart.o
obj-y += dev-uart.o
obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o
obj-$(CONFIG_S5P_DEV_UART) += s5p-dev-uart.o
@@
-53,10
+50,9
@@
obj-$(CONFIG_S3C_DMA) += dma.o s3c-dma-ops.o
obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o
# PM support
obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o
# PM support
+
obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_PM) += pm.o
-ifdef CONFIG_PLAT_SAMSUNG_SINGLE
obj-$(CONFIG_PM) += pm-gpio.o
obj-$(CONFIG_PM) += pm-gpio.o
-endif
obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o
obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o
obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o
obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o