diff options
author | Alex Elder <elder@linaro.org> | 2015-05-22 12:35:31 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-05-23 16:34:39 -0700 |
commit | e9385e5d5ab64a0d05758d84f2980943d3f5f12d (patch) | |
tree | 5d6efca906d3a86efcb55ec00ae8804316bcd2e2 | |
parent | 8ea70fe0497c5dd11451e7cf1084844cbdb2a349 (diff) |
greybus: include "gpbridge.h" from "greybus.h"
Avoid the need for all the source files to include "gpbridge.h"
by just having "greybus.h" include it.
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
-rw-r--r-- | drivers/staging/greybus/audio-dai.c | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/audio-gb-cmds.c | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/audio-pcm.c | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/audio.c | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/audio.h | 3 | ||||
-rw-r--r-- | drivers/staging/greybus/gpio.c | 1 | ||||
-rw-r--r-- | drivers/staging/greybus/greybus.h | 1 | ||||
-rw-r--r-- | drivers/staging/greybus/i2c.c | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/pwm.c | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/spi.c | 1 |
10 files changed, 7 insertions, 11 deletions
diff --git a/drivers/staging/greybus/audio-dai.c b/drivers/staging/greybus/audio-dai.c index 39b72f0d2138..0dd7364785ae 100644 --- a/drivers/staging/greybus/audio-dai.c +++ b/drivers/staging/greybus/audio-dai.c @@ -11,8 +11,8 @@ #include <sound/soc.h> #include <sound/dmaengine_pcm.h> #include <sound/simple_card.h> + #include "greybus.h" -#include "gpbridge.h" #include "audio.h" /* diff --git a/drivers/staging/greybus/audio-gb-cmds.c b/drivers/staging/greybus/audio-gb-cmds.c index 9dbde0d07a49..f6a29abca70f 100644 --- a/drivers/staging/greybus/audio-gb-cmds.c +++ b/drivers/staging/greybus/audio-gb-cmds.c @@ -1,6 +1,6 @@ #include <linux/kernel.h> + #include "greybus.h" -#include "gpbridge.h" #include "audio.h" #define GB_I2S_MGMT_VERSION_MAJOR 0x00 diff --git a/drivers/staging/greybus/audio-pcm.c b/drivers/staging/greybus/audio-pcm.c index b32700841444..a1faf7895b58 100644 --- a/drivers/staging/greybus/audio-pcm.c +++ b/drivers/staging/greybus/audio-pcm.c @@ -11,8 +11,8 @@ #include <sound/soc.h> #include <sound/dmaengine_pcm.h> #include <sound/simple_card.h> + #include "greybus.h" -#include "gpbridge.h" #include "audio.h" /* diff --git a/drivers/staging/greybus/audio.c b/drivers/staging/greybus/audio.c index 76b6bdc59847..c873f339da1d 100644 --- a/drivers/staging/greybus/audio.c +++ b/drivers/staging/greybus/audio.c @@ -10,8 +10,8 @@ #include <sound/soc.h> #include <sound/dmaengine_pcm.h> #include <sound/simple_card.h> + #include "greybus.h" -#include "gpbridge.h" #include "audio.h" diff --git a/drivers/staging/greybus/audio.h b/drivers/staging/greybus/audio.h index fa1bb54fd4da..c9087c9fc15c 100644 --- a/drivers/staging/greybus/audio.h +++ b/drivers/staging/greybus/audio.h @@ -7,9 +7,8 @@ #include <linux/i2c.h> #include <linux/platform_device.h> #include <sound/soc.h> -#include "greybus.h" -#include "gpbridge.h" +#include "greybus.h" #define GB_SAMPLE_RATE 48000 #define GB_RATES SNDRV_PCM_RATE_48000 diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c index 871f2d0558b0..6e5fe5b3db39 100644 --- a/drivers/staging/greybus/gpio.c +++ b/drivers/staging/greybus/gpio.c @@ -14,7 +14,6 @@ #include <linux/irq.h> #include <linux/irqdomain.h> #include "greybus.h" -#include "gpbridge.h" struct gb_gpio_line { /* The following has to be an array of line_max entries */ diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h index dbb4e78cf4c9..c58f12312d75 100644 --- a/drivers/staging/greybus/greybus.h +++ b/drivers/staging/greybus/greybus.h @@ -23,6 +23,7 @@ #include "kernel_ver.h" #include "greybus_id.h" #include "greybus_manifest.h" +#include "gpbridge.h" #include "manifest.h" #include "endo.h" #include "module.h" diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c index 14fdea184c39..01afca8408a0 100644 --- a/drivers/staging/greybus/i2c.c +++ b/drivers/staging/greybus/i2c.c @@ -13,8 +13,6 @@ #include <linux/i2c.h> #include "greybus.h" -#include "gpbridge.h" - struct gb_i2c_device { struct gb_connection *connection; diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c index 7f675bfed1d7..5dfeb0e761c1 100644 --- a/drivers/staging/greybus/pwm.c +++ b/drivers/staging/greybus/pwm.c @@ -11,8 +11,8 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/pwm.h> + #include "greybus.h" -#include "gpbridge.h" struct gb_pwm_chip { struct gb_connection *connection; diff --git a/drivers/staging/greybus/spi.c b/drivers/staging/greybus/spi.c index 430c3ad70a5a..78a7f85a4bf6 100644 --- a/drivers/staging/greybus/spi.c +++ b/drivers/staging/greybus/spi.c @@ -14,7 +14,6 @@ #include <linux/spi/spi.h> #include "greybus.h" -#include "gpbridge.h" struct gb_spi { struct gb_connection *connection; |