Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / fbtft / fbtft.h

diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
index 0d27daf23228adaeee72dac0027ebd2194f77d9c..3ccdec94fee74e60be8652f53bc6043d52cd5432 100644 (file)
--- a/drivers/staging/fbtft/fbtft.h
+++ b/drivers/staging/fbtft/fbtft.h
@@ -10,10 +10,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef __LINUX_FBTFT_H
@@ -24,7 +20,6 @@
 #include <linux/spi/spi.h>
 #include <linux/platform_device.h>
 
-
 #define FBTFT_NOP              0x00
 #define FBTFT_SWRESET  0x01
 #define FBTFT_RDDID            0x04
@@ -251,7 +246,7 @@ struct fbtft_par {
        } gamma;
        unsigned long debug;
        bool first_update_done;
-       struct timespec update_time;
+       ktime_t update_time;
        bool bgr;
        void *extra;
 };
@@ -295,7 +290,6 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...);
 void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...);
 void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...);
 
-
 #define FBTFT_REGISTER_DRIVER(_name, _compatible, _display)                \
                                                                           \
 static int fbtft_driver_probe_spi(struct spi_device *spi)                  \
@@ -368,7 +362,6 @@ static void __exit fbtft_driver_module_exit(void)                          \
 module_init(fbtft_driver_module_init);                                     \
 module_exit(fbtft_driver_module_exit);
 
-
 /* Debug macros */
 
 /* shorthand debug levels */
@@ -414,7 +407,6 @@ module_exit(fbtft_driver_module_exit);
 #define DEBUG_REQUEST_GPIOS_MATCH   (1<<30)
 #define DEBUG_VERIFY_GPIOS          (1<<31)
 
-
 #define fbtft_init_dbg(dev, format, arg...)                  \
 do {                                                         \
        if (unlikely((dev)->platform_data &&                 \
@@ -428,7 +420,6 @@ do {                                                         \
                dev_info(par->info->device, format, ##arg);  \
 } while (0)
 
-
 #define fbtft_par_dbg_hex(level, par, dev, type, buf, num, format, arg...) \
 do {                                                                       \
        if (unlikely(par->debug & level))                                  \