diff options
author | 2010-08-16 13:32:24 +0900 | |
---|---|---|
committer | 2010-08-16 13:32:24 +0900 | |
commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /drivers/staging/quickstart/Makefile | |
parent | sh: Use __GFP_ZERO for dma_generic_alloc_coherent(). (diff) | |
parent | Linux 2.6.36-rc1 (diff) | |
download | linux-dev-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.tar.xz linux-dev-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/staging/quickstart/Makefile')
-rw-r--r-- | drivers/staging/quickstart/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/quickstart/Makefile b/drivers/staging/quickstart/Makefile new file mode 100644 index 000000000000..290e0e476797 --- /dev/null +++ b/drivers/staging/quickstart/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_QUICKSTART) += quickstart.o |