diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-23 02:10:23 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-23 02:10:23 +0200 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /include/asm-s390/Kbuild | |
| parent | Merge branch 'upstream-fixes' into upstream (diff) | |
| parent | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan... (diff) | |
| download | linux-28eb177dfa5982d132edceed891cb3885df258bb.tar.xz linux-28eb177dfa5982d132edceed891cb3885df258bb.zip | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'include/asm-s390/Kbuild')
| -rw-r--r-- | include/asm-s390/Kbuild | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild index ed8955f49e47..088969d55e72 100644 --- a/include/asm-s390/Kbuild +++ b/include/asm-s390/Kbuild @@ -1,4 +1,12 @@ include include/asm-generic/Kbuild.asm -unifdef-y += cmb.h debug.h -header-y += dasd.h qeth.h tape390.h ucontext.h vtoc.h z90crypt.h +header-y += dasd.h +header-y += monwriter.h +header-y += qeth.h +header-y += tape390.h +header-y += ucontext.h +header-y += vtoc.h +header-y += z90crypt.h + +unifdef-y += cmb.h +unifdef-y += debug.h |