Mark Brown
558a171d77
Input: wm97xx - enable sub-drivers by default ...
Currently the support for each WM97xx touchscreen model is compiled out
by default, meaning that the default configuration when the driver is
built is for it to support no hardware. This is suboptimal and leads to
problems like distribution kernels shipping a non-functional driver.
Change the default to support all controllers and update the help text
to reflect this.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2008-07-29 01:27:03 -04:00
APCI: revert another duplicated patch
2008-07-20 17:14:57 -07:00
Merge commit 'origin/master'
2008-07-16 11:07:59 +10:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-07-18 02:39:39 -07:00
Miguel Ojeda has moved
2008-07-04 10:40:05 -07:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2008-07-16 17:25:46 -07:00
m68k: Return -ENODEV if no device is found
2008-07-20 17:24:38 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
cdrom: revert commit 22a9189 (cdrom: use kmalloced buffers instead of buffers on stack)
2008-07-04 09:52:14 +02:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
2008-07-21 00:55:14 -04:00
Fix printk format warning in clocksource/acpi_pm.c
2008-07-15 11:01:39 -07:00
crypto: ixp4xx - Select CRYPTO_AUTHENC
2008-07-13 20:12:11 +08:00
dio: use dio_match_device() in dio_bus_match()
2008-07-20 17:24:40 -07:00
Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2008-07-15 12:39:44 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
2008-07-14 15:51:11 -07:00
gpio: pca953x (i2c) handles max7310 too
2008-07-04 10:40:06 -07:00
drm/radeon: fixup issue with radeon and PAT support.
2008-07-15 15:48:05 +10:00
Merge commit 'v2.6.26' into bkl-removal
2008-07-14 15:29:34 -06:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
2008-07-21 00:55:14 -04:00
i2c: Convert the max6875 driver to a new-style i2c driver
2008-07-16 19:30:07 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
2008-07-17 10:55:07 -07:00
Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2008-07-15 12:39:44 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-07-18 02:39:39 -07:00
Input: wm97xx - enable sub-drivers by default
2008-07-29 01:27:03 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
Merge branch 'generic-ipi' into generic-ipi-for-linus
2008-07-15 21:55:59 +02:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
2008-07-21 00:55:14 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-07-15 18:58:04 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
2008-07-20 21:14:42 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-07-15 18:58:04 -07:00
mfd: let asic3 use mem resource instead of bus_shift
2008-07-20 19:56:44 +02:00
fujitsu-laptop: depends on INPUT
2008-07-16 23:27:03 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
2008-07-16 15:17:52 -07:00
[MIPS] MTX-1 flash partition setup move to platform devices registration
2008-07-15 18:44:38 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
OpenFirmware: Include <linux/of_i2c.h> from of_i2c.c.
2008-07-12 12:10:52 -06:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2008-07-16 17:25:46 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
2008-07-17 10:55:07 -07:00
PNPACPI: add support for HP vendor-specific CCSR descriptors
2008-07-16 23:27:07 +02:00
rapidio: fix device reference counting
2008-07-10 18:04:43 -07:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-07-14 16:06:58 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-07-18 02:39:39 -07:00
Merge commit 'v2.6.26' into bkl-removal
2008-07-14 15:29:34 -06:00
scsi_dh: Verify "dev" is a sdev before accessing it.
2008-07-16 17:54:21 -07:00
atmel_serial: Fix tty_port breakage
2008-07-20 17:12:37 -07:00
Merge commit ' 85082fd7cb' into test-build
2008-07-15 15:44:51 +10:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-08 16:30:17 -07:00
Merge commit 'v2.6.26' into bkl-removal
2008-07-14 15:29:34 -06:00
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
2008-07-14 16:54:07 -07:00
export c2p
2008-07-20 17:24:39 -07:00
w1/ds2482: Convert to a new-style driver
2008-07-16 19:30:07 +02:00
Merge commit 'origin/master'
2008-07-16 11:07:59 +10:00
Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2008-07-14 13:43:24 -07:00
zorro: use memory_read_from_buffer
2008-07-20 17:24:38 -07:00
gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.
2008-07-21 08:42:49 +10:00
558a171d77