Merge "Merge tag v4.4.55 into branch 'msm-4.4'" (ba53c451) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/Makefile

+1 −1

Original line number	Diff line number	Diff line
		subdir-y := accounting auxdisplay blackfin connector \
		filesystems filesystems ia64 laptops mic misc-devices \
		filesystems filesystems ia64 laptops misc-devices \
		networking pcmcia prctl ptp spi timers vDSO video4linux \
		watchdog

+4 −0

Original line number	Diff line number	Diff line
		@@ -1271,6 +1271,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		When zero, profiling data is discarded and associated
		debugfs files are removed at module unload time.

		goldfish [X86] Enable the goldfish android emulator platform.
		Don't use this when you are not running on the
		android emulator

		gpt [EFI] Forces disk with valid GPT signature but
		invalid Protective MBR to be treated as GPT. If the
		primary GPT is corrupted, it enables the backup/alternate

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		subdir-y := mpssd

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		ifndef CROSS_COMPILE
		# List of programs to build
		hostprogs-$(CONFIG_X86_64) := mpssd

		mpssd-objs := mpssd.o sysfs.o

		# Tell kbuild to always build the programs
		always := $(hostprogs-y)

		HOSTCFLAGS += -I$(objtree)/usr/include -I$(srctree)/tools/include

		ifdef DEBUG
		HOSTCFLAGS += -DDEBUG=$(DEBUG)
		endif

		HOSTLOADLIBES_mpssd := -lpthread

		install:
		install mpssd /usr/sbin/mpssd
		install micctrl /usr/sbin/micctrl
		endif

+1 −1