diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /drivers/Makefile | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 14cf9077bb2b..f3ebb30f1b7f 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -26,6 +26,7 @@ obj-$(CONFIG_REGULATOR) += regulator/ | |||
| 26 | 26 | ||
| 27 | # char/ comes before serial/ etc so that the VT console is the boot-time | 27 | # char/ comes before serial/ etc so that the VT console is the boot-time |
| 28 | # default. | 28 | # default. |
| 29 | obj-y += tty/ | ||
| 29 | obj-y += char/ | 30 | obj-y += char/ |
| 30 | 31 | ||
| 31 | # gpu/ comes after char for AGP vs DRM startup | 32 | # gpu/ comes after char for AGP vs DRM startup |