diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-11-22 00:42:06 +0100 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-11-22 00:42:06 +0100 |
commit | 300e812db26f4aa022e346f5fb9af1af134d98d8 (patch) | |
tree | 382b45253a704087e8aa0c770bf3fc2ad67d4b02 /drivers/tty/Makefile | |
parent | video: s3c-fb: fix transparency length for pixel blending (diff) | |
parent | Linux 3.2-rc2 (diff) | |
download | linux-300e812db26f4aa022e346f5fb9af1af134d98d8.tar.xz linux-300e812db26f4aa022e346f5fb9af1af134d98d8.zip |
Merge commit 'v3.2-rc2' into fbdev-next
Diffstat (limited to 'drivers/tty/Makefile')
-rw-r--r-- | drivers/tty/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile index ea89b0bd15fe..2953059530e4 100644 --- a/drivers/tty/Makefile +++ b/drivers/tty/Makefile @@ -26,5 +26,6 @@ obj-$(CONFIG_ROCKETPORT) += rocket.o obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o obj-$(CONFIG_SYNCLINK) += synclink.o +obj-$(CONFIG_PPC_EPAPR_HV_BYTECHAN) += ehv_bytechan.o obj-y += ipwireless/ |