diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
| commit | ce961e341258dc9f78da3c0d64231cf1afdc4e63 (patch) | |
| tree | 90c65241a72f55fbd67f58c05b091f714e4c2490 /include | |
| parent | 91d4a4264bc2dead4e3101c5064da35c78f4c89b (diff) | |
| parent | cf715885604004ccfc30bc4caa75d58a75bb02c7 (diff) | |
| download | barebox-ce961e341258dc9f78da3c0d64231cf1afdc4e63.tar.gz barebox-ce961e341258dc9f78da3c0d64231cf1afdc4e63.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/console.h | 1 | ||||
| -rw-r--r-- | include/debug_ll.h | 4 | ||||
| -rw-r--r-- | include/usb/usb.h | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/include/console.h b/include/console.h index beafb4d778..72b4a440e7 100644 --- a/include/console.h +++ b/include/console.h @@ -47,6 +47,7 @@ struct console_device { int (*set_active)(struct console_device *cdev, unsigned active); char *devname; + int devid; struct list_head list; diff --git a/include/debug_ll.h b/include/debug_ll.h index 288aa256e5..b0eb7cd7d9 100644 --- a/include/debug_ll.h +++ b/include/debug_ll.h @@ -33,7 +33,7 @@ #if defined (CONFIG_DEBUG_LL) -static inline void putc_ll(unsigned char value) +static inline void putc_ll(char value) { PUTC_LL(value); } @@ -67,7 +67,7 @@ static inline void puts_ll(const char * str) #else -static inline void putc_ll(unsigned char value) +static inline void putc_ll(char value) { } diff --git a/include/usb/usb.h b/include/usb/usb.h index f02f1fbb57..991f3d7dd1 100644 --- a/include/usb/usb.h +++ b/include/usb/usb.h @@ -171,10 +171,6 @@ int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int transfer_len, int interval); void usb_disable_asynch(int disable); int usb_maxpacket(struct usb_device *dev, unsigned long pipe); -static inline void wait_ms(unsigned long ms) -{ - mdelay(ms); -}; int usb_get_configuration_no(struct usb_device *dev, unsigned char *buffer, int cfgno); int usb_get_report(struct usb_device *dev, int ifnum, unsigned char type, |