diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /include/asm-alpha | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/Kbuild | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-alpha/Kbuild b/include/asm-alpha/Kbuild index 2b06b3bad5ff..b7c8f188b313 100644 --- a/include/asm-alpha/Kbuild +++ b/include/asm-alpha/Kbuild | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | unifdef-y += console.h fpu.h sysinfo.h compiler.h | 3 | header-y += gentrap.h |
| 4 | header-y += regdef.h | ||
| 5 | header-y += pal.h | ||
| 6 | header-y += reg.h | ||
| 4 | 7 | ||
| 5 | header-y += gentrap.h regdef.h pal.h reg.h | 8 | unifdef-y += console.h |
| 9 | unifdef-y += fpu.h | ||
| 10 | unifdef-y += sysinfo.h | ||
| 11 | unifdef-y += compiler.h | ||