diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:23:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:23:46 -0500 |
commit | ba93c6297b9cfad5a70b5e5ed13c9dbead6601d3 (patch) | |
tree | 3785afef7c0f7b72ec87f88fc19b88bfb48386fe /drivers | |
parent | e031d33efde817ce6b4f907f0fa1ff021301748f (diff) | |
parent | 2b422383c3d8dcd203dd9aea70155be6258dbf6c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
README: bzip2 is not new
Documentation/Changes: remove outdated translation references
remove dead Radeon URL
SCSI_AACRAID: add a help text
update the i386 defconfig
MAINTAINERS: remove the LANMEDIA entry
Move ip2.c and ip2main.c to drivers/char/ip2/ where the other files
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/Makefile | 2 | ||||
-rw-r--r-- | drivers/char/drm/Kconfig | 4 | ||||
-rw-r--r-- | drivers/char/ip2/Makefile | 8 | ||||
-rw-r--r-- | drivers/char/ip2/ip2base.c (renamed from drivers/char/ip2.c) | 6 | ||||
-rw-r--r-- | drivers/char/ip2/ip2main.c (renamed from drivers/char/ip2main.c) | 20 | ||||
-rw-r--r-- | drivers/scsi/Kconfig | 8 | ||||
-rw-r--r-- | drivers/video/Kconfig | 2 |
7 files changed, 32 insertions, 18 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 503dd901d406..090d154098bb 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
@@ -31,7 +31,7 @@ obj-$(CONFIG_MOXA_INTELLIO) += moxa.o | |||
31 | obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o | 31 | obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o |
32 | obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o | 32 | obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o |
33 | obj-$(CONFIG_MOXA_SMARTIO) += mxser.o | 33 | obj-$(CONFIG_MOXA_SMARTIO) += mxser.o |
34 | obj-$(CONFIG_COMPUTONE) += ip2.o ip2main.o | 34 | obj-$(CONFIG_COMPUTONE) += ip2/ |
35 | obj-$(CONFIG_RISCOM8) += riscom8.o | 35 | obj-$(CONFIG_RISCOM8) += riscom8.o |
36 | obj-$(CONFIG_ISI) += isicom.o | 36 | obj-$(CONFIG_ISI) += isicom.o |
37 | obj-$(CONFIG_SYNCLINK) += synclink.o | 37 | obj-$(CONFIG_SYNCLINK) += synclink.o |
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig index 56ace9d5e2ae..5278c388d3e7 100644 --- a/drivers/char/drm/Kconfig +++ b/drivers/char/drm/Kconfig | |||
@@ -37,8 +37,8 @@ config DRM_RADEON | |||
37 | help | 37 | help |
38 | Choose this option if you have an ATI Radeon graphics card. There | 38 | Choose this option if you have an ATI Radeon graphics card. There |
39 | are both PCI and AGP versions. You don't need to choose this to | 39 | are both PCI and AGP versions. You don't need to choose this to |
40 | run the Radeon in plain VGA mode. There is a product page at | 40 | run the Radeon in plain VGA mode. |
41 | <http://www.ati.com/na/pages/products/pc/radeon32/index.html>. | 41 | |
42 | If M is selected, the module will be called radeon. | 42 | If M is selected, the module will be called radeon. |
43 | 43 | ||
44 | config DRM_I810 | 44 | config DRM_I810 |
diff --git a/drivers/char/ip2/Makefile b/drivers/char/ip2/Makefile new file mode 100644 index 000000000000..6bfe2543ddc2 --- /dev/null +++ b/drivers/char/ip2/Makefile | |||
@@ -0,0 +1,8 @@ | |||
1 | # | ||
2 | # Makefile for the Computone IntelliPort Plus Driver | ||
3 | # | ||
4 | |||
5 | obj-$(CONFIG_COMPUTONE) += ip2.o ip2main.o | ||
6 | |||
7 | ip2-objs := ip2base.o | ||
8 | |||
diff --git a/drivers/char/ip2.c b/drivers/char/ip2/ip2base.c index 7cadfc6ef352..435ccfc74958 100644 --- a/drivers/char/ip2.c +++ b/drivers/char/ip2/ip2base.c | |||
@@ -20,14 +20,14 @@ | |||
20 | #define __initdata | 20 | #define __initdata |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #include "./ip2/ip2types.h" | 23 | #include "ip2types.h" |
24 | #include "./ip2/fip_firm.h" // the meat | 24 | #include "fip_firm.h" // the meat |
25 | 25 | ||
26 | int | 26 | int |
27 | ip2_loadmain(int *, int *, unsigned char *, int ); // ref into ip2main.c | 27 | ip2_loadmain(int *, int *, unsigned char *, int ); // ref into ip2main.c |
28 | 28 | ||
29 | /* Note: Add compiled in defaults to these arrays, not to the structure | 29 | /* Note: Add compiled in defaults to these arrays, not to the structure |
30 | in ip2/ip2.h any longer. That structure WILL get overridden | 30 | in ip2.h any longer. That structure WILL get overridden |
31 | by these values, or command line values, or insmod values!!! =mhw= | 31 | by these values, or command line values, or insmod values!!! =mhw= |
32 | */ | 32 | */ |
33 | static int io[IP2_MAX_BOARDS]= { 0, 0, 0, 0 }; | 33 | static int io[IP2_MAX_BOARDS]= { 0, 0, 0, 0 }; |
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2/ip2main.c index 48fcfba37bfa..03db1cb3fa95 100644 --- a/drivers/char/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -35,7 +35,7 @@ | |||
35 | // Clean up potential NULL pointer dereferences | 35 | // Clean up potential NULL pointer dereferences |
36 | // Clean up devfs registration | 36 | // Clean up devfs registration |
37 | // Add kernel command line parsing for io and irq | 37 | // Add kernel command line parsing for io and irq |
38 | // Compile defaults for io and irq are now set in ip2.c not ip2/ip2.h! | 38 | // Compile defaults for io and irq are now set in ip2.c not ip2.h! |
39 | // Reworked poll_only hack for explicit parameter setting | 39 | // Reworked poll_only hack for explicit parameter setting |
40 | // You must now EXPLICITLY set poll_only = 1 or set all irqs to 0 | 40 | // You must now EXPLICITLY set poll_only = 1 or set all irqs to 0 |
41 | // Merged ip2_loadmain and old_ip2_init | 41 | // Merged ip2_loadmain and old_ip2_init |
@@ -123,12 +123,12 @@ | |||
123 | 123 | ||
124 | #include <asm/uaccess.h> | 124 | #include <asm/uaccess.h> |
125 | 125 | ||
126 | #include "./ip2/ip2types.h" | 126 | #include "ip2types.h" |
127 | #include "./ip2/ip2trace.h" | 127 | #include "ip2trace.h" |
128 | #include "./ip2/ip2ioctl.h" | 128 | #include "ip2ioctl.h" |
129 | #include "./ip2/ip2.h" | 129 | #include "ip2.h" |
130 | #include "./ip2/i2ellis.h" | 130 | #include "i2ellis.h" |
131 | #include "./ip2/i2lib.h" | 131 | #include "i2lib.h" |
132 | 132 | ||
133 | /***************** | 133 | /***************** |
134 | * /proc/ip2mem * | 134 | * /proc/ip2mem * |
@@ -282,9 +282,9 @@ static int tracewrap; | |||
282 | /* Code */ | 282 | /* Code */ |
283 | /********/ | 283 | /********/ |
284 | 284 | ||
285 | #include "./ip2/i2ellis.c" /* Extremely low-level interface services */ | 285 | #include "i2ellis.c" /* Extremely low-level interface services */ |
286 | #include "./ip2/i2cmd.c" /* Standard loadware command definitions */ | 286 | #include "i2cmd.c" /* Standard loadware command definitions */ |
287 | #include "./ip2/i2lib.c" /* High level interface services */ | 287 | #include "i2lib.c" /* High level interface services */ |
288 | 288 | ||
289 | /* Configuration area for modprobe */ | 289 | /* Configuration area for modprobe */ |
290 | 290 | ||
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 3c606cf8c8ca..5c94a5d4efc0 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -379,6 +379,14 @@ config SCSI_AHA1740 | |||
379 | config SCSI_AACRAID | 379 | config SCSI_AACRAID |
380 | tristate "Adaptec AACRAID support" | 380 | tristate "Adaptec AACRAID support" |
381 | depends on SCSI && PCI | 381 | depends on SCSI && PCI |
382 | help | ||
383 | This driver supports a variety of Dell, HP, Adaptec, IBM and | ||
384 | ICP storage products. For a list of supported products, refer | ||
385 | to <file:Documentation/scsi/aacraid.txt>. | ||
386 | |||
387 | To compile this driver as a module, choose M here: the module | ||
388 | will be called aacraid. | ||
389 | |||
382 | 390 | ||
383 | source "drivers/scsi/aic7xxx/Kconfig.aic7xxx" | 391 | source "drivers/scsi/aic7xxx/Kconfig.aic7xxx" |
384 | 392 | ||
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index f5079c78ba4e..fdebd60a3250 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -899,8 +899,6 @@ config FB_RADEON_OLD | |||
899 | Choose this option if you want to use an ATI Radeon graphics card as | 899 | Choose this option if you want to use an ATI Radeon graphics card as |
900 | a framebuffer device. There are both PCI and AGP versions. You | 900 | a framebuffer device. There are both PCI and AGP versions. You |
901 | don't need to choose this to run the Radeon in plain VGA mode. | 901 | don't need to choose this to run the Radeon in plain VGA mode. |
902 | There is a product page at | ||
903 | <http://www.ati.com/na/pages/products/pc/radeon32/index.html>. | ||
904 | 902 | ||
905 | config FB_RADEON | 903 | config FB_RADEON |
906 | tristate "ATI Radeon display support" | 904 | tristate "ATI Radeon display support" |