diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:50:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:50:13 -0400 |
| commit | 517d08699b250021303f9a7cf0d758b6dc0748ed (patch) | |
| tree | 5e5b0134c3fffb78fe9d8b1641a64ff28fdd7bbc /drivers/eisa | |
| parent | 8eeee4e2f04fc551f50c9d9847da2d73d7d33728 (diff) | |
| parent | a34601c5d84134055782ee031d58d82f5440e918 (diff) | |
Merge branch 'akpm'
* akpm: (182 commits)
fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset
fbdev: *bfin*: fix __dev{init,exit} markings
fbdev: *bfin*: drop unnecessary calls to memset
fbdev: bfin-t350mcqb-fb: drop unused local variables
fbdev: blackfin has __raw I/O accessors, so use them in fb.h
fbdev: s1d13xxxfb: add accelerated bitblt functions
tcx: use standard fields for framebuffer physical address and length
fbdev: add support for handoff from firmware to hw framebuffers
intelfb: fix a bug when changing video timing
fbdev: use framebuffer_release() for freeing fb_info structures
radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
s3c-fb: CPUFREQ frequency scaling support
s3c-fb: fix resource releasing on error during probing
carminefb: fix possible access beyond end of carmine_modedb[]
acornfb: remove fb_mmap function
mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF
mb862xxfb: restrict compliation of platform driver to PPC
Samsung SoC Framebuffer driver: add Alpha Channel support
atmel-lcdc: fix pixclock upper bound detection
offb: use framebuffer_alloc() to allocate fb_info struct
...
Manually fix up conflicts due to kmemcheck in mm/slab.c
Diffstat (limited to 'drivers/eisa')
| -rw-r--r-- | drivers/eisa/eisa.ids | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/eisa/eisa.ids b/drivers/eisa/eisa.ids index ed69837d8b74..6cbb7a514436 100644 --- a/drivers/eisa/eisa.ids +++ b/drivers/eisa/eisa.ids | |||
| @@ -1140,6 +1140,11 @@ NON0301 "c't Universale Graphic Adapter" | |||
| 1140 | NON0401 "c't Universal Ethernet Adapter" | 1140 | NON0401 "c't Universal Ethernet Adapter" |
| 1141 | NON0501 "c't Universal 16-Bit Sound Adapter" | 1141 | NON0501 "c't Universal 16-Bit Sound Adapter" |
| 1142 | NON0601 "c't Universal 8-Bit Adapter" | 1142 | NON0601 "c't Universal 8-Bit Adapter" |
| 1143 | NPI0120 "Network Peripherals NP-EISA-1 FDDI Interface" | ||
| 1144 | NPI0221 "Network Peripherals NP-EISA-2 FDDI Interface" | ||
| 1145 | NPI0223 "Network Peripherals NP-EISA-2E Enhanced FDDI Interface" | ||
| 1146 | NPI0301 "Network Peripherals NP-EISA-3 FDDI Interface" | ||
| 1147 | NPI0303 "Network Peripherals NP-EISA-3E Enhanced FDDI Interface" | ||
| 1143 | NSS0011 "Newport Systems Solutions WNIC Adapter" | 1148 | NSS0011 "Newport Systems Solutions WNIC Adapter" |
| 1144 | NVL0701 "Novell NE3200 Bus Master Ethernet" | 1149 | NVL0701 "Novell NE3200 Bus Master Ethernet" |
| 1145 | NVL0702 "Novell NE3200T Bus Master Ethernet" | 1150 | NVL0702 "Novell NE3200T Bus Master Ethernet" |