diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /include/drm/Kbuild | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'include/drm/Kbuild')
| -rw-r--r-- | include/drm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/Kbuild b/include/drm/Kbuild index b940fdfa3b25..cfa6af43c9ea 100644 --- a/include/drm/Kbuild +++ b/include/drm/Kbuild | |||
| @@ -8,3 +8,4 @@ unifdef-y += radeon_drm.h | |||
| 8 | unifdef-y += sis_drm.h | 8 | unifdef-y += sis_drm.h |
| 9 | unifdef-y += savage_drm.h | 9 | unifdef-y += savage_drm.h |
| 10 | unifdef-y += via_drm.h | 10 | unifdef-y += via_drm.h |
| 11 | unifdef-y += nouveau_drm.h | ||