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/sound/Kbuild | |
| 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/sound/Kbuild')
| -rw-r--r-- | include/sound/Kbuild | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/sound/Kbuild b/include/sound/Kbuild index 3a5a3df61496..fd054a344324 100644 --- a/include/sound/Kbuild +++ b/include/sound/Kbuild | |||
| @@ -1,2 +1,10 @@ | |||
| 1 | header-y := asound_fm.h hdsp.h hdspm.h sfnt_info.h sscape_ioctl.h | 1 | header-y += asound_fm.h |
| 2 | unifdef-y := asequencer.h asound.h emu10k1.h sb16_csp.h | 2 | header-y += hdsp.h |
| 3 | header-y += hdspm.h | ||
| 4 | header-y += sfnt_info.h | ||
| 5 | header-y += sscape_ioctl.h | ||
| 6 | |||
| 7 | unifdef-y += asequencer.h | ||
| 8 | unifdef-y += asound.h | ||
| 9 | unifdef-y += emu10k1.h | ||
| 10 | unifdef-y += sb16_csp.h | ||