[PATCH] logo: Kconfig: make BAREBOX_LOGO_* depend on BAREBOX_LOGO

[PATCH] logo: Kconfig: make BAREBOX_LOGO_* depend on BAREBOX_LOGO

[Antony Pavlov]

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 lib/logo/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/logo/Kconfig b/lib/logo/Kconfig
index 5b40d75..0718053 100644
--- a/lib/logo/Kconfig
+++ b/lib/logo/Kconfig
@@ -5,6 +5,8 @@ menuconfig BAREBOX_LOGO
 	  dependencies. The logo can be found under /logo/barebox-logo-<width>.png
 	  in the running barebox.
 
+if BAREBOX_LOGO
+
 config BAREBOX_LOGO_64
 	bool "include 64x32 pixel logo"
 
@@ -19,3 +21,5 @@ config BAREBOX_LOGO_400
 
 config BAREBOX_LOGO_640
 	bool "include 640x320 pixel logo"
+
+endif # BAREBOX_LOGO
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH] usb: storage: fix warning: no previous prototype for 'usb_stor_Bulk_clear_endpt_stall'

[Antony Pavlov]

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 drivers/usb/storage/transport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index ac1fe79..4140991 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -54,7 +54,7 @@ static const unsigned char us_direction[256/8] = {
  */
 
 /* Clear a stall on an endpoint - special for bulk-only devices */
-int usb_stor_Bulk_clear_endpt_stall(struct us_data *us, unsigned int pipe)
+static int usb_stor_Bulk_clear_endpt_stall(struct us_data *us, unsigned int pipe)
 {
 	return usb_clear_halt(us->pusb_dev, pipe);
 }
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] logo: Kconfig: make BAREBOX_LOGO_* depend on BAREBOX_LOGO

[Sascha Hauer]

On Sat, Sep 12, 2015 at 11:34:28PM +0300, Antony Pavlov wrote:
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> ---
>  lib/logo/Kconfig | 4 ++++
>  1 file changed, 4 insertions(+)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox