Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 219728
b: refs/heads/master
c: 6cd5a9a
h: refs/heads/master
v: v3
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Sep 5, 2010
1 parent 416fbb2 commit 919568b
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ded1e38d7fcc0a2ad3124b3bf8dd10cc2870c764
refs/heads/master: 6cd5a9a35c3de4ed28b55212698fe69c328e4206
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-1710 |
| Description : Hardware Layer Access For APCI-1710 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-035 |
| Description : Hardware Layer Access For APCI-035 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-1032 |
| Description : Hardware Layer Access For APCI-1032 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-1500 |
| Description : Hardware Layer Access For APCI-1500 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-1516 |
| Description : Hardware Layer Access For APCI-1516 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-1564 |
| Description : Hardware Layer Access For APCI-1564 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-2016 |
| Description : Hardware Layer Access For APCI-2016 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-2032 |
| Description : Hardware Layer Access For APCI-2032 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-2200 |
| Description : Hardware Layer Access For APCI-2200 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-3200 |
| Description : Hardware Layer Access For APCI-3200 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+-------------------------------+---------------------------------------+
| Project manager: Eric Stolz | Date : 02/12/2002 |
+-------------------------------+---------------------------------------+
| Description : Hardware Layer Acces For APCI-3501 |
| Description : Hardware Layer Access For APCI-3501 |
+-----------------------------------------------------------------------+
| UPDATES |
+----------+-----------+------------------------------------------------+
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/comedi/drivers/aio_aio12_8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
comedi/drivers/aio_aio12_8.c
Driver for Acces I/O Products PC-104 AIO12-8 Analog I/O Board
Driver for Access I/O Products PC-104 AIO12-8 Analog I/O Board
Copyright (C) 2006 C&C Technologies, Inc.
This program is free software; you can redistribute it and/or modify
Expand All @@ -23,10 +23,10 @@
/*
Driver: aio_aio12_8
Description: Acces I/O Products PC-104 AIO12-8 Analog I/O Board
Description: Access I/O Products PC-104 AIO12-8 Analog I/O Board
Author: Pablo Mejia <pablo.mejia@cctechnol.com>
Devices:
[Acces I/O] PC-104 AIO12-8
[Access I/O] PC-104 AIO12-8
Status: experimental
Configuration Options:
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/comedi/drivers/aio_iiro_16.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
comedi/drivers/aio_iiro_16.c
Driver for Acces I/O Products PC-104 AIO-IIRO-16 Digital I/O board
Driver for Access I/O Products PC-104 AIO-IIRO-16 Digital I/O board
Copyright (C) 2006 C&C Technologies, Inc.
This program is free software; you can redistribute it and/or modify
Expand All @@ -23,10 +23,10 @@
/*
Driver: aio_iiro_16
Description: Acces I/O Products PC-104 IIRO16 Relay And Isolated Input Board
Description: Access I/O Products PC-104 IIRO16 Relay And Isolated Input Board
Author: Zachary Ware <zach.ware@cctechnol.com>
Devices:
[Acces I/O] PC-104 AIO12-8
[Access I/O] PC-104 AIO12-8
Status: experimental
Configuration Options:
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/sca3000.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
#define SCA3000_INT_STATUS_X_TRIGGER 0x02
#define SCA3000_INT_STATUS_Z_TRIGGER 0x01

/* Used to allow accesss to multiplexed registers */
/* Used to allow access to multiplexed registers */
#define SCA3000_REG_ADDR_CTRL_SEL 0x18
/* Only available for SCA3000-D03 and SCA3000-D01 */
#define SCA3000_REG_CTRL_SEL_I2C_DISABLE 0x01
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/octeon/cvmx-fpa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ CVMX_SHARED cvmx_fpa_pool_info_t cvmx_fpa_pool_info[CVMX_FPA_NUM_POOLS];
* @name: Constant character string to name this pool.
* String is not copied.
* @buffer: Pointer to the block of memory to use. This must be
* accessable by all processors and external hardware.
* accessible by all processors and external hardware.
* @block_size: Size for each block controlled by the FPA
* @num_blocks: Number of blocks
*
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/octeon/cvmx-fpa.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static inline void cvmx_fpa_free(void *ptr, uint64_t pool,
* @name: Constant character string to name this pool.
* String is not copied.
* @buffer: Pointer to the block of memory to use. This must be
* accessable by all processors and external hardware.
* accessible by all processors and external hardware.
* @block_size: Size for each block controlled by the FPA
* @num_blocks: Number of blocks
*
Expand Down

0 comments on commit 919568b

Please sign in to comment.