Merge branch 'master' of /usr/src/ntfs-2.6/

#

# NOTE! Don't add files that are generated in specific

# subdirectories here. Add them in the ".gitignore" file

# in that subdirectory instead.

#

# Normal rules

#

.*

*.o

*.a

*.s

*.ko

*.mod.c

#

# Top-level generic files

#

vmlinux*

System.map

Module.symvers

#

# Generated include files

#

include/asm

include/config

include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

# Link of vmlinux

# If CONFIG_KALLSYMS is set .version is already updated

# Generate System.map and verify that the content is consistent

# Use + in front of the vmlinux_version rule to silent warning with make -j2

# First command is ':' to allow us to use + in front of the rule

define rule_vmlinux__

	:

	$(if $(CONFIG_KALLSYMS),,+$(call cmd,vmlinux_version))

	$(call cmd,vmlinux__)

	struct clk *clk = ERR_PTR(-ENOENT);

	int idno;

	idno = (dev == NULL) ? -1 : to_platform_device(dev)->id;

	if (dev == NULL || dev->bus != &platform_bus_type)

		idno = -1;

	else

		idno = to_platform_device(dev)->id;

	down(&clocks_sem);

			return_VALUE(-EAGAIN);

		result = acpi_bus_receive_event(&event);

		if (result) {

			return_VALUE(-EIO);

		}

		if (result)

			return_VALUE(result);

		chars_remaining = sprintf(str, "%s %s %08x %08x\n",

					  event.device_class ? event.

consolemap_deftbl.c

defkeymap.c