diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-28 10:35:58 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-28 10:35:58 +0200 |
| commit | 40aad62d1c2d0b49ab16d6891bbcbb3b39a56df9 (patch) | |
| tree | f4b4ff7345379b62e29ff59b05c313a1ecaadbf6 /include | |
| parent | 1a6fc8feb61c7fb27d206851baf60e3e60c2c90a (diff) | |
| parent | 112d65d3d2bde37529e61d6ad3011c39a1f65589 (diff) | |
| download | barebox-40aad62d1c2d0b49ab16d6891bbcbb3b39a56df9.tar.gz barebox-40aad62d1c2d0b49ab16d6891bbcbb3b39a56df9.tar.xz | |
Merge remote branch 'origin/assorted-pu' into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/fb.h | 4 | ||||
| -rw-r--r-- | include/usb/usbnet.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/fb.h b/include/fb.h index 218500b985..379f931e9c 100644 --- a/include/fb.h +++ b/include/fb.h @@ -96,7 +96,9 @@ struct fb_info { struct fb_bitfield red; /* bitfield in fb mem if true color, */ struct fb_bitfield green; /* else only length is significant */ struct fb_bitfield blue; - struct fb_bitfield transp; /* transparency */ + struct fb_bitfield transp; /* transparency */ + + int enabled; }; int register_framebuffer(struct fb_info *info); diff --git a/include/usb/usbnet.h b/include/usb/usbnet.h index 77f19603c2..e3ea373d95 100644 --- a/include/usb/usbnet.h +++ b/include/usb/usbnet.h @@ -54,8 +54,6 @@ struct usbnet { # define EVENT_RX_MEMORY 2 # define EVENT_STS_SPLIT 3 # define EVENT_LINK_RESET 4 - /* FIXME: Our eth_device should have this, not us! */ - struct device_d dev; }; #if 0 |