diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 18:06:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 18:06:57 -0700 |
commit | 101b82f56d50a445bb5281f834c86e106732070f (patch) | |
tree | 951e204487494557ca0f231e7fd8457bc58dddd2 /arch/avr32/include/asm/Kbuild | |
parent | 3cb7a59fd8c816af6765f3712cd233d83984edf2 (diff) | |
parent | 0c9b5a317b8ae7201fed07ec66d642b2ad7ea1b0 (diff) | |
download | talos-op-linux-101b82f56d50a445bb5281f834c86e106732070f.tar.gz talos-op-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/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 |