Skip to contentSkip to conversation

logo: Kconfig: make BAREBOX_LOGO_* depend on BAREBOX_LOGO

PATCH Applied Antony Pavlov 2 participants 3 messages Sep 12, 2015 – Sep 14, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 logo: Kconfig: make BAREBOX_LOGO_* depend on BAREBOX_LOGO

---
 lib/logo/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
lib/logo/Kconfig +4 -0
index 5b40d75..0718053 100644
@@ -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
Signature · 7 lines
2.5.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 1/1 usb: storage: fix warning: no previous prototype for 'usb_stor_Bulk_clear_endpt_stall'

---
 drivers/usb/storage/transport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/transport.c +1 -1
index ac1fe79..4140991 100644
@@ -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);
 }
Signature · 7 lines
2.5.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#2 lore raw
In reply to Antony Pavlov
Quoted 4 lines · Antony Pavlov
---
 lib/logo/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)

Applied, thanks

Sascha

Signature · 9 lines
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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox