diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 12:56:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 12:56:25 -0400 |
| commit | f2937e4540836be5c4db7e0a721ce3cfc59036e3 (patch) | |
| tree | f7c68473490deabbe334279a132bc87816eaf694 /drivers | |
| parent | 1d508f8ace3e78e96da70f1cf4e36b80f22b5fa9 (diff) | |
| parent | a2a368d905472293d4e13d09fdd9e537edc74347 (diff) | |
Merge branch 'akpm' (fixes from Andrew Morton)
Merge leftovers from Andrew Morton:
"A few leftovers.
I have a bunch of OCFS2 patches which are still out for review and
which I might sneak along after -rc1. Partly my fault - I should send
my review pokes out earlier"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: fix CROSS_MEMORY_ATTACH help text grammar
drivers/mfd/rtsx_usb.c: export device table
mm, hugetlb_cgroup: align hugetlb cgroup limit to hugepage size
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/rtsx_usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/rtsx_usb.c b/drivers/mfd/rtsx_usb.c index 6352bec8419a..71f387ce8cbd 100644 --- a/drivers/mfd/rtsx_usb.c +++ b/drivers/mfd/rtsx_usb.c | |||
| @@ -744,6 +744,7 @@ static struct usb_device_id rtsx_usb_usb_ids[] = { | |||
| 744 | { USB_DEVICE(0x0BDA, 0x0140) }, | 744 | { USB_DEVICE(0x0BDA, 0x0140) }, |
| 745 | { } | 745 | { } |
| 746 | }; | 746 | }; |
| 747 | MODULE_DEVICE_TABLE(usb, rtsx_usb_usb_ids); | ||
| 747 | 748 | ||
| 748 | static struct usb_driver rtsx_usb_driver = { | 749 | static struct usb_driver rtsx_usb_driver = { |
| 749 | .name = "rtsx_usb", | 750 | .name = "rtsx_usb", |