diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:40:19 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:40:19 +0200 |
commit | f35c69b736e4f910d7447346980145212c283570 (patch) | |
tree | 824b90cd870e6de07bbba19d761c1c74cf1fb4a7 /arch/avr32/include/asm/Kbuild | |
parent | uio/uio_pci_generic: Use module_pci_driver to register driver (diff) | |
parent | Linux 3.10-rc3 (diff) | |
download | linux-f35c69b736e4f910d7447346980145212c283570.tar.xz linux-f35c69b736e4f910d7447346980145212c283570.zip |
Merge 3.10-rc3 into char-misc-next
We want the changes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/avr32/include/asm/Kbuild')
-rw-r--r-- | arch/avr32/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild index 4dd4f78d3dcc..d22af851f3f6 100644 --- a/arch/avr32/include/asm/Kbuild +++ b/arch/avr32/include/asm/Kbuild @@ -2,3 +2,4 @@ generic-y += clkdev.h generic-y += exec.h generic-y += trace_clock.h +generic-y += param.h |