diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
commit | 68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch) | |
tree | 5fb2d14340332062e416246c5759adcaa64a2340 /drivers/video/samsung_extdisp | |
parent | 17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff) | |
parent | b99374450c03bf5081b88995d91d34fb9b2fd040 (diff) | |
download | kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2 |
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'drivers/video/samsung_extdisp')
-rw-r--r-- | drivers/video/samsung_extdisp/s3cfb_extdsp.h | 2 | ||||
-rw-r--r-- | drivers/video/samsung_extdisp/s3cfb_extdsp_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/samsung_extdisp/s3cfb_extdsp.h b/drivers/video/samsung_extdisp/s3cfb_extdsp.h index 99f134c..11f4f37 100644 --- a/drivers/video/samsung_extdisp/s3cfb_extdsp.h +++ b/drivers/video/samsung_extdisp/s3cfb_extdsp.h @@ -151,7 +151,7 @@ struct s3cfb_extdsp_user_window { #define S3CFB_EXTDSP_GET_FREE_BUFFER _IOW('F', 329, unsigned int) extern struct fb_ops s3cfb_extdsp_ops; -extern inline struct s3cfb_extdsp_global *get_extdsp_global(int id); +extern struct s3cfb_extdsp_global *get_extdsp_global(int id); /* S3CFB_EXTDSP */ extern int s3cfb_extdsp_enable_window(struct s3cfb_extdsp_global *fbdev, int id); diff --git a/drivers/video/samsung_extdisp/s3cfb_extdsp_main.c b/drivers/video/samsung_extdisp/s3cfb_extdsp_main.c index 4f9f2b2..dacd94d 100644 --- a/drivers/video/samsung_extdisp/s3cfb_extdsp_main.c +++ b/drivers/video/samsung_extdisp/s3cfb_extdsp_main.c @@ -43,7 +43,7 @@ struct s3cfb_extdsp_extdsp_desc *fbextdsp; -inline struct s3cfb_extdsp_global *get_extdsp_global(int id) +struct s3cfb_extdsp_global *get_extdsp_global(int id) { struct s3cfb_extdsp_global *fbdev; |