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/linux/dvb/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/linux/dvb/Kbuild')
| -rw-r--r-- | include/linux/dvb/Kbuild | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild index 63973af72fd5..d97b3a51e227 100644 --- a/include/linux/dvb/Kbuild +++ b/include/linux/dvb/Kbuild | |||
| @@ -1,2 +1,9 @@ | |||
| 1 | header-y += ca.h frontend.h net.h osd.h version.h | 1 | header-y += ca.h |
| 2 | unifdef-y := audio.h dmx.h video.h | 2 | header-y += frontend.h |
| 3 | header-y += net.h | ||
| 4 | header-y += osd.h | ||
| 5 | header-y += version.h | ||
| 6 | |||
| 7 | unifdef-y += audio.h | ||
| 8 | unifdef-y += dmx.h | ||
| 9 | unifdef-y += video.h | ||