Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[net-next-2.6.git] / arch / arm / mach-at91 / Kconfig

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 851e8139ef9d1a4c9511022696b10fc17a49ff52..abed4d15a7fdfee9b8616c14e8d3da0d1ab6e6c8 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -109,7 +109,7 @@ config MACH_ONEARM
        bool "Ajeco 1ARM Single Board Computer"
        help
          Select this if you are using Ajeco's 1ARM Single Board Computer.
        bool "Ajeco 1ARM Single Board Computer"
        help
          Select this if you are using Ajeco's 1ARM Single Board Computer.

-         <http://www.ajeco.fi/products.htm>
+         <http://www.ajeco.fi/>

 
 config ARCH_AT91RM9200DK
        bool "Atmel AT91RM9200-DK Development board"
 
 config ARCH_AT91RM9200DK
        bool "Atmel AT91RM9200-DK Development board"


@@ -141,7 +141,7 @@ config MACH_CARMEVA
        bool "Conitec ARM&EVA"
        help
          Select this if you are using Conitec's AT91RM9200-MCU-Module.
        bool "Conitec ARM&EVA"
        help
          Select this if you are using Conitec's AT91RM9200-MCU-Module.

-         <http://www.conitec.net/english/linuxboard.htm>
+         <http://www.conitec.net/english/linuxboard.php>

 
 config MACH_ATEB9200
        bool "Embest ATEB9200"
 
 config MACH_ATEB9200
        bool "Embest ATEB9200"


@@ -153,7 +153,7 @@ config MACH_KB9200
        bool "KwikByte KB920x"
        help
          Select this if you are using KwikByte's KB920x board.
        bool "KwikByte KB920x"
        help
          Select this if you are using KwikByte's KB920x board.

-         <http://kwikbyte.com/KB9202_description_new.htm>
+         <http://www.kwikbyte.com/KB9202.html>

 
 config MACH_PICOTUX2XX
        bool "picotux 200"
 
 config MACH_PICOTUX2XX
        bool "picotux 200"