diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-02-06 16:11:09 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-06 16:12:16 +0100 |
| commit | d4730ace0c7dbb64513e35b6fc5fd7e7f381e490 (patch) | |
| tree | 18890c096cdd869a593c56de3257faa40af8e050 /drivers/memstick/host/jmb38x_ms.c | |
| parent | HID: hyperv: Properly disconnect the input device (diff) | |
| parent | Merge tag 'pm-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-d4730ace0c7dbb64513e35b6fc5fd7e7f381e490.tar.xz linux-d4730ace0c7dbb64513e35b6fc5fd7e7f381e490.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into upstream-fixes
Sync with Linus' tree. This is necessary to have a base for
patch that fixes commit 35b4c01e29b ("power_supply: add "powers"
links to self-powered HID devices") which went in through Anton's
tree.
Diffstat (limited to 'drivers/memstick/host/jmb38x_ms.c')
| -rw-r--r-- | drivers/memstick/host/jmb38x_ms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index 6ce70e9615d3..5319e9b65847 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c @@ -21,7 +21,7 @@ #define DRIVER_NAME "jmb38x_ms" -static int no_dma; +static bool no_dma; module_param(no_dma, bool, 0644); enum { |