diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-10 15:14:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-10 15:14:26 +1000 |
| commit | dce750fa285f0107c1eb8b9edcf19e40e2628c4a (patch) | |
| tree | 506468613b6e4051fd9d3528b5f8026c757cd4f8 /drivers/staging/asus_oled/asus_oled.c | |
| parent | 2b5e8511554f577dd5045a586aa513a3ecf1c4b6 (diff) | |
| parent | c1cfeb2b7e86543897b250717bcd4ae7c8f8a6b9 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/rtl8187se/r8180_core.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
Diffstat (limited to 'drivers/staging/asus_oled/asus_oled.c')
| -rw-r--r-- | drivers/staging/asus_oled/asus_oled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c index 7ebecc92c61b..5b279fb30f3f 100644 --- a/drivers/staging/asus_oled/asus_oled.c +++ b/drivers/staging/asus_oled/asus_oled.c @@ -771,7 +771,7 @@ static struct usb_driver oled_driver = { }; static CLASS_ATTR_STRING(version, S_IRUGO, - ASUS_OLED_UNDERSCORE_NAME " " ASUS_OLED_VERSION); + ASUS_OLED_UNDERSCORE_NAME " " ASUS_OLED_VERSION); static int __init asus_oled_init(void) { |