diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-22 10:08:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-22 10:08:40 -0700 |
| commit | 3eb9992caff10b62cf0ed0bcb1667a58b13188fa (patch) | |
| tree | abe4b4b586978773e2df21898eda611bc6eb822c /drivers/video/fbdev/savage/Makefile | |
| parent | e347fa5f4271769bc31fb462631c213aa3824588 (diff) | |
| parent | a798c10faf62a505d24e5f6213fbaf904a39623f (diff) | |
Merge 3.15-rc2 into staging-next
This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/fbdev/savage/Makefile')
| -rw-r--r-- | drivers/video/fbdev/savage/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/fbdev/savage/Makefile b/drivers/video/fbdev/savage/Makefile new file mode 100644 index 000000000000..e09770fff8ea --- /dev/null +++ b/drivers/video/fbdev/savage/Makefile @@ -0,0 +1,9 @@ +# +# Makefile for the S3 Savage framebuffer driver +# + +obj-$(CONFIG_FB_SAVAGE) += savagefb.o + +savagefb-y += savagefb_driver.o +savagefb-$(CONFIG_FB_SAVAGE_I2C) += savagefb-i2c.o +savagefb-$(CONFIG_FB_SAVAGE_ACCEL) += savagefb_accel.o |