FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-10 19:43:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Daniel Mack 9360340262 leds: ALIX2: Add dependency to !GPIO_CS5335 
The ALIX2 LED driver and the CS5535 GPIO drivers share the same I/O
range which causes a conflict if they're both enabled. Fix this for now
by adding Kconfig dependencies. While at it, also drop the EXPERIMENTAL
flag, as the code has been around for awhile already.

Note that this is a hack. At some point, a real platform support for
this board should be added which handles the LEDs via the leds-gpio
driver.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-03-16 19:49:20 +00:00
..
accessibility
…
acpi
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
2010-03-14 21:30:17 -04:00
amba
…
ata
…
atm
…
auxdisplay
…
base
…
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
bluetooth
…
cdrom
…
char
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-03-13 14:45:49 -08:00
clocksource
…
connector
…
cpufreq
…
cpuidle
…
crypto
…
dca
…
dio
…
dma
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
edac
edac: e752x: add dram scrubbing support
2010-03-12 15:52:40 -08:00
eisa
…
firewire
…
firmware
…
gpio
…
gpu
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
hid
Input: scancode in get/set_keycodes should be unsigned
2010-03-08 23:19:15 -08:00
hwmon
…
i2c
Add include to i2c-xii.c to fix build error
2010-03-14 11:14:58 -07:00
ide
…
idle
…
ieee1394
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
ieee802154
…
infiniband
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2010-03-13 14:38:31 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-03-14 11:13:54 -07:00
isdn
…
leds
leds: ALIX2: Add dependency to !GPIO_CS5335
2010-03-16 19:49:20 +00:00
lguest
…
macintosh
…
mca
…
md
…
media
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-03-14 11:13:54 -07:00
memstick
…
message
…
mfd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2010-03-12 16:41:09 -08:00
misc
init dynamic bin_attribute structures
2010-03-14 20:28:39 -07:00
mmc
Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
2010-03-12 16:21:24 -08:00
mtd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-03-13 14:50:18 -08:00
nubus
…
of
…
oprofile
…
parisc
…
parport
…
pci
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
2010-03-14 21:30:17 -04:00
pcmcia
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-03-12 16:00:54 -08:00
platform
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
2010-03-14 21:30:17 -04:00
pnp
PNPACPI: add bus number support
2010-03-14 20:08:38 -04:00
power
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
2010-03-14 21:30:17 -04:00
pps
pps: serial clients support
2010-03-12 15:52:43 -08:00
ps3
…
rapidio
…
regulator
…
rtc
init dynamic bin_attribute structures
2010-03-14 20:28:39 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-03-13 14:50:18 -08:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
2010-03-13 21:29:38 -08:00
serial
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
sfi
…
sh
…
sn
…
spi
…
ssb
…
staging
…
tc
…
telephony
…
thermal
…
uio
…
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
uwb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
vhost
…
video
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
2010-03-13 21:29:38 -08:00
virtio
…
vlynq
…
w1
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
watchdog
…
xen
…
zorro
…
Kconfig
…
Makefile
…