diff options
| -rw-r--r-- | Documentation/arm/Interrupts | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 2 | ||||
| -rw-r--r-- | include/asm-arm26/io.h | 2 | ||||
| -rw-r--r-- | include/asm-arm26/memory.h | 4 | ||||
| -rw-r--r-- | include/asm-arm26/setup.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/arm/Interrupts b/Documentation/arm/Interrupts index 72c93de8cd4e..0d3dbf1099bc 100644 --- a/Documentation/arm/Interrupts +++ b/Documentation/arm/Interrupts | |||
| @@ -149,7 +149,7 @@ So, what's changed? | |||
| 149 | 149 | ||
| 150 | 3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type. | 150 | 3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type. |
| 151 | 151 | ||
| 152 | 4. Direct access to SA1111 INTPOL is depreciated. Use set_irq_type instead. | 152 | 4. Direct access to SA1111 INTPOL is deprecated. Use set_irq_type instead. |
| 153 | 153 | ||
| 154 | 5. A handler is expected to perform any necessary acknowledgement of the | 154 | 5. A handler is expected to perform any necessary acknowledgement of the |
| 155 | parent IRQ via the correct chip specific function. For instance, if | 155 | parent IRQ via the correct chip specific function. For instance, if |
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 6e90619b3b41..36d2c7d4f4d0 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
| @@ -140,7 +140,7 @@ config BAYCOM_SER_HDX | |||
| 140 | modems that connect to a serial interface. The driver supports the | 140 | modems that connect to a serial interface. The driver supports the |
| 141 | ser12 design in half-duplex mode. This is the old driver. It is | 141 | ser12 design in half-duplex mode. This is the old driver. It is |
| 142 | still provided in case your serial interface chip does not work with | 142 | still provided in case your serial interface chip does not work with |
| 143 | the full-duplex driver. This driver is depreciated. To configure | 143 | the full-duplex driver. This driver is deprecated. To configure |
| 144 | the driver, use the sethdlc utility available in the standard ax25 | 144 | the driver, use the sethdlc utility available in the standard ax25 |
| 145 | utilities package. For information on the modems, see | 145 | utilities package. For information on the modems, see |
| 146 | <http://www.baycom.de/> and | 146 | <http://www.baycom.de/> and |
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 841b3c136ad9..283be4a70524 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
| @@ -3054,7 +3054,7 @@ static const iw_handler prism54_handler[] = { | |||
| 3054 | (iw_handler) prism54_set_wap, /* SIOCSIWAP */ | 3054 | (iw_handler) prism54_set_wap, /* SIOCSIWAP */ |
| 3055 | (iw_handler) prism54_get_wap, /* SIOCGIWAP */ | 3055 | (iw_handler) prism54_get_wap, /* SIOCGIWAP */ |
| 3056 | (iw_handler) NULL, /* -- hole -- */ | 3056 | (iw_handler) NULL, /* -- hole -- */ |
| 3057 | (iw_handler) NULL, /* SIOCGIWAPLIST depreciated */ | 3057 | (iw_handler) NULL, /* SIOCGIWAPLIST deprecated */ |
| 3058 | (iw_handler) prism54_set_scan, /* SIOCSIWSCAN */ | 3058 | (iw_handler) prism54_set_scan, /* SIOCSIWSCAN */ |
| 3059 | (iw_handler) prism54_get_scan, /* SIOCGIWSCAN */ | 3059 | (iw_handler) prism54_get_scan, /* SIOCGIWSCAN */ |
| 3060 | (iw_handler) prism54_set_essid, /* SIOCSIWESSID */ | 3060 | (iw_handler) prism54_set_essid, /* SIOCSIWESSID */ |
diff --git a/include/asm-arm26/io.h b/include/asm-arm26/io.h index 2aa033bd0678..a5a7a4d5e09c 100644 --- a/include/asm-arm26/io.h +++ b/include/asm-arm26/io.h | |||
| @@ -321,7 +321,7 @@ DECLARE_IO(int,l,"") | |||
| 321 | 321 | ||
| 322 | #define mmiowb() | 322 | #define mmiowb() |
| 323 | 323 | ||
| 324 | /* the following macro is depreciated */ | 324 | /* the following macro is deprecated */ |
| 325 | #define ioaddr(port) __ioaddr((port)) | 325 | #define ioaddr(port) __ioaddr((port)) |
| 326 | 326 | ||
| 327 | /* | 327 | /* |
diff --git a/include/asm-arm26/memory.h b/include/asm-arm26/memory.h index a65f10b80dfb..7c1e5be39060 100644 --- a/include/asm-arm26/memory.h +++ b/include/asm-arm26/memory.h | |||
| @@ -60,7 +60,7 @@ static inline void *phys_to_virt(unsigned long x) | |||
| 60 | /* | 60 | /* |
| 61 | * Virtual <-> DMA view memory address translations | 61 | * Virtual <-> DMA view memory address translations |
| 62 | * Again, these are *only* valid on the kernel direct mapped RAM | 62 | * Again, these are *only* valid on the kernel direct mapped RAM |
| 63 | * memory. Use of these is *depreciated*. | 63 | * memory. Use of these is *deprecated*. |
| 64 | */ | 64 | */ |
| 65 | #define virt_to_bus(x) ((unsigned long)(x)) | 65 | #define virt_to_bus(x) ((unsigned long)(x)) |
| 66 | #define bus_to_virt(x) ((void *)((unsigned long)(x))) | 66 | #define bus_to_virt(x) ((void *)((unsigned long)(x))) |
| @@ -93,7 +93,7 @@ static inline void *phys_to_virt(unsigned long x) | |||
| 93 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | 93 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
| 94 | 94 | ||
| 95 | /* | 95 | /* |
| 96 | * We should really eliminate virt_to_bus() here - it's depreciated. | 96 | * We should really eliminate virt_to_bus() here - it's deprecated. |
| 97 | */ | 97 | */ |
| 98 | #define page_to_bus(page) (page_address(page)) | 98 | #define page_to_bus(page) (page_address(page)) |
| 99 | 99 | ||
diff --git a/include/asm-arm26/setup.h b/include/asm-arm26/setup.h index 1a867b4e8d53..10fd07c76662 100644 --- a/include/asm-arm26/setup.h +++ b/include/asm-arm26/setup.h | |||
| @@ -70,7 +70,7 @@ struct tag_ramdisk { | |||
| 70 | /* describes where the compressed ramdisk image lives */ | 70 | /* describes where the compressed ramdisk image lives */ |
| 71 | /* | 71 | /* |
| 72 | * this one accidentally used virtual addresses - as such, | 72 | * this one accidentally used virtual addresses - as such, |
| 73 | * its depreciated. | 73 | * it's deprecated. |
| 74 | */ | 74 | */ |
| 75 | #define ATAG_INITRD 0x54410005 | 75 | #define ATAG_INITRD 0x54410005 |
| 76 | 76 | ||
