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/video/pm2fb.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/video/pm2fb.c')
| -rw-r--r-- | drivers/video/pm2fb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index dc7bfa91e57..df31a24a502 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c @@ -78,12 +78,12 @@ static char *mode_option __devinitdata; * these flags allow the user to specify that requests for +ve sync * should be silently turned in -ve sync. */ -static int lowhsync; -static int lowvsync; -static int noaccel __devinitdata; +static bool lowhsync; +static bool lowvsync; +static bool noaccel __devinitdata; /* mtrr option */ #ifdef CONFIG_MTRR -static int nomtrr __devinitdata; +static bool nomtrr __devinitdata; #endif /* |