Merge branch 'master' into upstream (1a2e8a6f) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/filesystems/sysfs.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ class/
		devices/
		firmware/
		net/
		fs/

		devices/ contains a filesystem representation of the device tree. It maps
		directly to the internal kernel device tree, which is a hierarchy of
		@@ -264,6 +265,10 @@ drivers/ contains a directory for each device driver that is loaded
		for devices on that particular bus (this assumes that drivers do not
		span multiple bus types).

		fs/ contains a directory for some filesystems. Currently each
		filesystem wanting to export attributes must create its own hierarchy
		below fs/ (see ./fuse.txt for an example).


		More information can driver-model specific features can be found in
		Documentation/driver-model/.

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -
		tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)

		ifeq ($(CONFIG_AEABI),y)
		CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork
		CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork
		else
		CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
		endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y)
		obj-y += io.o
		endif

		head-y := head.o
		head-y := head$(MMUEXT).o
		obj-$(CONFIG_DEBUG_LL) += debug.o

		extra-y := $(head-y) init_task.o vmlinux.lds

+3 −1