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/video | |
| 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/video')
| -rw-r--r-- | include/video/Kbuild | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/video/Kbuild b/include/video/Kbuild index 0e406f730c2f..ad3e622c5339 100644 --- a/include/video/Kbuild +++ b/include/video/Kbuild | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | unifdef-y += sisfb.h uvesafb.h | 1 | header-y += edid.h |
| 2 | unifdef-y += edid.h | 2 | header-y += sisfb.h |
| 3 | header-y += uvesafb.h | ||