diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-23 03:06:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-23 03:06:57 +0200 |
commit | 101b82f56d50a445bb5281f834c86e106732070f (patch) | |
tree | 951e204487494557ca0f231e7fd8457bc58dddd2 /arch/avr32/include/uapi/asm/Kbuild | |
parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
parent | avr32: fix building warnings caused by redefinitions of HZ (diff) | |
download | linux-101b82f56d50a445bb5281f834c86e106732070f.tar.xz linux-101b82f56d50a445bb5281f834c86e106732070f.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 update from Hans-Christian Egtvedt:
"wow, it has gone 10 releases since my last request :("
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: fix building warnings caused by redefinitions of HZ
avr32: fix relocation check for signed 18-bit offset
avr32: move NODES_SHIFT into Kconfig and delete numnodes.h
Diffstat (limited to 'arch/avr32/include/uapi/asm/Kbuild')
-rw-r--r-- | arch/avr32/include/uapi/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index df53e7a46774..3b85eaddf525 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -33,3 +33,4 @@ header-y += termbits.h header-y += termios.h header-y += types.h header-y += unistd.h +generic-y += param.h |