Wolfram Sang bb015f0c85 pcmcia: drop already defined PCI_IDs ... Out of 10 PCI_IDs found in the PCMCIA subsystem, only two were not defined in pci_ids.h. Move them and drop the duplicates. Successfully build-tested. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>		2009-10-24 17:13:01 +02:00
..
accessibility
acpi	Merge branch 'misc' into release	2009-10-15 00:47:13 -04:00
amba
ata	ahci: Add ifdef wrapper to ahci_gtf_filter_workaround	2009-10-09 00:29:07 -04:00
atm	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
auxdisplay
base
block	cciss: Add cciss_allow_hpsa module parameter	2009-10-13 09:18:22 +02:00
bluetooth
cdrom	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2009-10-15 15:06:02 -07:00
clocksource
connector	connector: Fix incompatible pointer type warning	2009-10-06 01:39:51 -07:00
cpufreq
cpuidle
crypto
dca
dio
dma
edac	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-10-08 12:06:36 -07:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-10-14 15:36:19 -07:00
firmware	iSCSI/iBFT: use proper address translation	2009-10-05 12:05:40 -07:00
gpio	const: constify remaining file_operations	2009-10-01 16:11:11 -07:00
gpu	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-10-09 09:19:23 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2009-10-13 10:10:33 -07:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-10-11 11:23:33 -07:00
i2c	i2c: Hide probe errors caused by ACPI resource conflicts	2009-10-04 22:53:45 +02:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6	2009-10-08 11:59:06 -07:00
idle
ieee1394	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
ieee802154
infiniband	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
input	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
isdn	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
leds	leds: leds-pca9532 - Drop unused module parameters	2009-10-04 22:53:43 +02:00
lguest	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
macintosh	powerpc/pmac: Fix issues with sleep on some powerbooks	2009-10-14 16:58:35 +11:00
mca
md	block: Seperate read and write statistics of in_flight requests v2	2009-10-06 20:16:55 +02:00
media	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
memstick	memstick: move dev_dbg	2009-09-24 07:21:05 -07:00
message	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
mfd	mfd: Fix twl4030 boot with twl4030 usb transceiver enabled	2009-10-12 15:19:23 +02:00
misc	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
mmc	[ARM] pxamci: fix printing gpio numbers in pxamci_probe	2009-10-12 15:30:50 +08:00
mtd	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-10-15 15:03:17 -07:00
nubus
of
oprofile	oprofile: warn on freeing event buffer too early	2009-10-09 21:32:05 +02:00
parisc
parport	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
pci	headers: Fix build after <linux/sched.h> removal	2009-10-13 10:20:16 -07:00
pcmcia	pcmcia: drop already defined PCI_IDs	2009-10-24 17:13:01 +02:00
platform	Merge branch 'misc' into release	2009-10-15 00:47:13 -04:00
pnp	ACPI: remove acpi_device.flags.hardware_id	2009-09-25 15:09:48 -04:00
power
pps
ps3
rapidio
regulator
rtc	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
s390	[S390] sclp_vt220 build fix	2009-10-14 12:43:54 +02:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6	2009-10-11 11:12:33 -07:00
serial	tty, serial: Fix race and NULL check in uart_close()	2009-10-12 10:21:33 -07:00
sfi	SFI: remove __init from sfi_verify_table	2009-10-03 01:16:12 -04:00
sh
sn
spi	ARM: 5741/1: pl022: fix peripheral id for ST vendor	2009-10-05 17:55:55 +01:00
ssb
staging	Staging: rt2860sta: prevent a panic when disabling when associated	2009-10-14 14:14:40 -07:00
tc
telephony
thermal
uio	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
usb	USB: gadget: Fix EEM driver comments and VID/PID	2009-10-14 14:54:44 -07:00
uwb	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
video	Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-10-08 12:01:01 -07:00
virtio
vlynq	drivers/vlynq/vlynq.c: fix resource size off by 1 error	2009-09-24 07:21:05 -07:00
w1	ds2482: Discard obsolete detect method	2009-10-04 22:53:41 +02:00
watchdog	watchdog: Fix rio watchdog probe function	2009-10-14 01:18:26 -07:00
xen	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
zorro
Kconfig
Makefile	Merge git://git.infradead.org/mtd-2.6	2009-09-23 10:07:49 -07:00