diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-16 14:23:04 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-16 14:25:34 +0200 |
| commit | 46479e698530b8197d601a23317b7c7654195338 (patch) | |
| tree | 710b2758ecd7d8a6ada37724c5d4c8027d5f358f /drivers/macintosh/ams/ams-core.c | |
| parent | 7b99b659d90c5d421cb1867295c78a4c0c030734 (diff) | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git
Conflicts:
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/macintosh/ams/ams-core.c')
| -rw-r--r-- | drivers/macintosh/ams/ams-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/ams/ams-core.c b/drivers/macintosh/ams/ams-core.c index 399beb1638d1..5c6a2d876562 100644 --- a/drivers/macintosh/ams/ams-core.c +++ b/drivers/macintosh/ams/ams-core.c @@ -31,7 +31,7 @@ /* There is only one motion sensor per machine */ struct ams ams_info; -static unsigned int verbose; +static bool verbose; module_param(verbose, bool, 0644); MODULE_PARM_DESC(verbose, "Show free falls and shocks in kernel output"); |