Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 304479
b: refs/heads/master
c: 06458e2
h: refs/heads/master
i:
  304477: 323fa1c
  304475: b310310
  304471: cfb3d9e
  304463: dc181f0
  304447: f489f02
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Apr 25, 2012
1 parent c8b51a5 commit d4256c0
Show file tree
Hide file tree
Showing 128 changed files with 287 additions and 288 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: 68284a12923f9f8f2741efca10c045e179f2e753
refs/heads/master: 06458e277eac2b8761b0a04d3c808d57be281a2e
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/Documentation/iio_event_monitor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include "iio_utils.h"
#include "../events.h"
#include <linux/iio/events.h>

static const char * const iio_chan_type_name_spec[] = {
[IIO_VOLTAGE] = "voltage",
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/accel/adis16201_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#include <linux/sysfs.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>

#include "adis16201.h"

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16201_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>

#include "../iio.h"
#include <linux/iio/iio.h>
#include "../ring_sw.h"
#include "../trigger_consumer.h"
#include <linux/iio/trigger_consumer.h>
#include "adis16201.h"


Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16201_trigger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <linux/spi/spi.h>
#include <linux/export.h>

#include "../iio.h"
#include "../trigger.h"
#include <linux/iio/iio.h>
#include <linux/iio/trigger.h>
#include "adis16201.h"

/**
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/accel/adis16203_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#include <linux/sysfs.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>

#include "adis16203.h"

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16203_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>

#include "../iio.h"
#include <linux/iio/iio.h>
#include "../ring_sw.h"
#include "../trigger_consumer.h"
#include <linux/iio/trigger_consumer.h>
#include "adis16203.h"

/**
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16203_trigger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <linux/spi/spi.h>
#include <linux/export.h>

#include "../iio.h"
#include "../trigger.h"
#include <linux/iio/iio.h>
#include <linux/iio/trigger.h>
#include "adis16203.h"

/**
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/accel/adis16204_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <linux/list.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>

#include "adis16204.h"

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16204_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>

#include "../iio.h"
#include <linux/iio/iio.h>
#include "../ring_sw.h"
#include "../trigger_consumer.h"
#include <linux/iio/trigger_consumer.h>
#include "adis16204.h"

/**
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16204_trigger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <linux/spi/spi.h>
#include <linux/export.h>

#include "../iio.h"
#include "../trigger.h"
#include <linux/iio/iio.h>
#include <linux/iio/trigger.h>
#include "adis16204.h"

/**
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/accel/adis16209_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <linux/list.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>

#include "adis16209.h"

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16209_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>

#include "../iio.h"
#include <linux/iio/iio.h>
#include "../ring_sw.h"
#include "../trigger_consumer.h"
#include <linux/iio/trigger_consumer.h>
#include "adis16209.h"

/**
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16209_trigger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <linux/spi/spi.h>
#include <linux/export.h>

#include "../iio.h"
#include "../trigger.h"
#include <linux/iio/iio.h>
#include <linux/iio/trigger.h>
#include "adis16209.h"

/**
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16220_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include <linux/sysfs.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>

#include "adis16220.h"

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/accel/adis16240_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <linux/list.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>

#include "adis16240.h"

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16240_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>

#include "../iio.h"
#include <linux/iio/iio.h>
#include "../ring_sw.h"
#include "../trigger_consumer.h"
#include <linux/iio/trigger_consumer.h>
#include "adis16240.h"

/**
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16240_trigger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <linux/spi/spi.h>
#include <linux/export.h>

#include "../iio.h"
#include "../trigger.h"
#include <linux/iio/iio.h>
#include <linux/iio/trigger.h>
#include "adis16240.h"

/**
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/accel/kxsd9.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <linux/slab.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>

#define KXSD9_REG_X 0x00
#define KXSD9_REG_Y 0x02
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/iio/accel/lis3l02dq_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
#include <linux/sysfs.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/events.h>
#include <linux/iio/buffer.h>

#include "lis3l02dq.h"

Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/iio/accel/lis3l02dq_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#include <linux/slab.h>
#include <linux/export.h>

#include "../iio.h"
#include <linux/iio/iio.h>
#include "../ring_sw.h"
#include "../kfifo_buf.h"
#include "../trigger.h"
#include "../trigger_consumer.h"
#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger.h>
#include <linux/iio/trigger_consumer.h>
#include "lis3l02dq.h"

/**
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/iio/accel/sca3000_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#include <linux/spi/spi.h>
#include <linux/sysfs.h>
#include <linux/module.h>
#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/events.h>
#include <linux/iio/buffer.h>

#include "sca3000.h"

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/accel/sca3000_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <linux/sched.h>
#include <linux/poll.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>
#include "../ring_hw.h"
#include "sca3000.h"

Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/staging/iio/adc/ad7192.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
#include <linux/sched.h>
#include <linux/delay.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>
#include "../ring_sw.h"
#include "../trigger.h"
#include "../trigger_consumer.h"
#include <linux/iio/trigger.h>
#include <linux/iio/trigger_consumer.h>

#include "ad7192.h"

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/adc/ad7280a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/events.h>

#include "ad7280a.h"

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/adc/ad7291.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#include <linux/regulator/consumer.h>
#include <linux/err.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../events.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/events.h>

/*
* Simplified handling
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/adc/ad7298_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <linux/delay.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>

#include "ad7298.h"

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/adc/ad7298_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#include <linux/slab.h>
#include <linux/spi/spi.h>

#include "../iio.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/buffer.h>
#include "../ring_sw.h"
#include "../trigger_consumer.h"
#include <linux/iio/trigger_consumer.h>

#include "ad7298.h"

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/adc/ad7476_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#include <linux/err.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>

#include "ad7476.h"

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/adc/ad7476_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
#include <linux/slab.h>
#include <linux/spi/spi.h>

#include "../iio.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/buffer.h>
#include "../ring_sw.h"
#include "../trigger_consumer.h"
#include <linux/iio/trigger_consumer.h>

#include "ad7476.h"

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/adc/ad7606_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <linux/sched.h>
#include <linux/module.h>

#include "../iio.h"
#include "../sysfs.h"
#include "../buffer.h"
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>

#include "ad7606.h"

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7606_par.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <linux/err.h>
#include <linux/io.h>

#include "../iio.h"
#include <linux/iio/iio.h>
#include "ad7606.h"

static int ad7606_par16_read_block(struct device *dev,
Expand Down
Loading

0 comments on commit d4256c0

Please sign in to comment.