diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-01 09:43:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-01 09:43:53 +0200 |
| commit | f387bc96bb23658ecdaa67bc9bff6fd290f636f8 (patch) | |
| tree | 48b64d6fab38d4ef3e324110320804c7d8b87366 /include | |
| parent | b6b7203acaaf56c02aeadcdc677152b750481cdc (diff) | |
| parent | 4cf3e91acaecb5e0b4c35f2c74fa194fac73a720 (diff) | |
| download | barebox-f387bc96bb23658ecdaa67bc9bff6fd290f636f8.tar.gz barebox-f387bc96bb23658ecdaa67bc9bff6fd290f636f8.tar.xz | |
Merge branch 'for-next/fb-imx-ipu-v3'
Diffstat (limited to 'include')
| -rw-r--r-- | include/dma.h | 1 | ||||
| -rw-r--r-- | include/video/backlight.h | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/include/dma.h b/include/dma.h index 800d8b155f..4d31797968 100644 --- a/include/dma.h +++ b/include/dma.h @@ -39,5 +39,6 @@ void dma_sync_single_for_device(unsigned long address, size_t size, void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle); void dma_free_coherent(void *mem, dma_addr_t dma_handle, size_t size); +void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle); #endif /* __DMA_H */ diff --git a/include/video/backlight.h b/include/video/backlight.h index 56e0341ea4..8dc49dc113 100644 --- a/include/video/backlight.h +++ b/include/video/backlight.h @@ -1,6 +1,7 @@ #ifndef __VIDEO_BACKLIGHT_H #define __VIDEO_BACKLIGHT_H +#ifdef CONFIG_DRIVER_VIDEO_BACKLIGHT struct backlight_device { int brightness; int brightness_cur; @@ -16,5 +17,21 @@ int backlight_set_brightness(struct backlight_device *, int brightness); int backlight_set_brightness_default(struct backlight_device *); int backlight_register(struct backlight_device *); struct backlight_device *of_backlight_find(struct device_node *node); +#else +struct backlight_device ; + +static inline int +backlight_set_brightness(struct backlight_device *dev, int brightness) +{ + return 0; +} +static inline int +backlight_set_brightness_default(struct backlight_device *dev) +{ + return 0; +} +static inline struct backlight_device * +of_backlight_find(struct device_node *node) { return NULL; } +#endif #endif /* __VIDEO_BACKLIGHT_H */ |