diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /drivers/Makefile | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
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 4af7d5b124ce..bf15ce7493d2 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 |