silence compiling warnings

Conflicts:
	drivers/input/keyboard/cypress/cypress-touchkey.c
	drivers/input/keyboard/cypress/issp_main.c.rej
	drivers/video/samsung/s3cfb_ops.c