diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-02 13:41:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-02 13:41:26 -0500 |
| commit | 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 (patch) | |
| tree | a80892424269083c292d3eee29c4b3e6289d588b /include/linux/Kbuild | |
| parent | 5057bfaff82e12f01a2ffd58f55535cbd7c5c3a2 (diff) | |
| parent | 21df20fcfb4e88f4cd4991e9e67de549e6480adf (diff) | |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (49 commits)
OMAP: DSS2: Taal: Fix TE when resuming
OMAP: DSS2: Taal: Fix ESD check
OMAP: DSS2: OMAPFB: Constify some function parameters
OMAP: DSS2: OMAPFB: install omapfb.h
OMAP: DSS2: DSI: add error prints
OMAP: DSS2: TPO-TD03MTEA1: fix function names
OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper
OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE
OMAP: DSS2: DSI: remove external TE support
OMAP: DSS2: move timing functions
OMAP: DSS2: move set/get_wss()
OMAP: DSS2: move enable/disable/suspend/resume
OMAP: DSS2: move update() and sync()
OMAP: DSS2: move set/get_update_mode()
OMAP: DSS2: move enable/get_te()
OMAP: DSS2: move get_recommended_bpp()
OMAP: DSS2: move get_resolution()
OMAP: DSS2: move enable/disable_channel to overlay manager
OMAP: DSS2: move wait_vsync()
OMAP: DSS2: move get/set_rotate()
...
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 5b0d997f23ef..e2ea0b2159cd 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -126,6 +126,7 @@ header-y += nfs2.h | |||
| 126 | header-y += nfs4_mount.h | 126 | header-y += nfs4_mount.h |
| 127 | header-y += nfs_mount.h | 127 | header-y += nfs_mount.h |
| 128 | header-y += nl80211.h | 128 | header-y += nl80211.h |
| 129 | header-y += omapfb.h | ||
| 129 | header-y += param.h | 130 | header-y += param.h |
| 130 | header-y += pci_regs.h | 131 | header-y += pci_regs.h |
| 131 | header-y += perf_event.h | 132 | header-y += perf_event.h |