diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 19:21:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 19:21:50 -0400 |
| commit | 5d7cb157025b3b4852f38e6e5e97d06ef12c1d78 (patch) | |
| tree | 09831b553687b51749ed99dbabaf3687a4e4bd2a /include/linux/dvb | |
| parent | fc58fb180755cdeda3ce58776eef94a01b37a1c1 (diff) | |
| parent | 8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup:
defconfig reduction
kbuild: drop unifdef-y support
archs: replace unifdef-y with header-y
include: replace unifdef-y with header-y
Diffstat (limited to 'include/linux/dvb')
| -rw-r--r-- | include/linux/dvb/Kbuild | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild index d97b3a51e227..f4dba8637f98 100644 --- a/include/linux/dvb/Kbuild +++ b/include/linux/dvb/Kbuild | |||
| @@ -1,9 +1,8 @@ | |||
| 1 | header-y += audio.h | ||
| 1 | header-y += ca.h | 2 | header-y += ca.h |
| 3 | header-y += dmx.h | ||
| 2 | header-y += frontend.h | 4 | header-y += frontend.h |
| 3 | header-y += net.h | 5 | header-y += net.h |
| 4 | header-y += osd.h | 6 | header-y += osd.h |
| 5 | header-y += version.h | 7 | header-y += version.h |
| 6 | 8 | header-y += video.h | |
| 7 | unifdef-y += audio.h | ||
| 8 | unifdef-y += dmx.h | ||
| 9 | unifdef-y += video.h | ||