diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:34:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:34:21 -0400 |
commit | fb09bafda67041b74a668dc9d77735e36bd33d3b (patch) | |
tree | 2dd32b65062a95045468fdcab366ecdb8e4fcac6 /drivers/staging/Makefile | |
parent | 94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9 (diff) | |
parent | c3c6cc91b0ae7b3d598488ad0b593bafba4a0817 (diff) |
Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree changes from Greg Kroah-Hartman:
"Here is the big staging tree pull request for the 3.5-rc1 merge
window.
Loads of changes here, and we just narrowly added more lines than we
added:
622 files changed, 28356 insertions(+), 26059 deletions(-)
But, good news is that there is a number of subsystems that moved out
of the staging tree, to their respective "real" portions of the
kernel.
Code that moved out was:
- iio core code
- mei driver
- vme core and bridge drivers
There was one broken network driver that moved into staging as a step
before it is removed from the tree (pc300), and there was a few new
drivers added to the tree:
- new iio drivers
- gdm72xx wimax USB driver
- ipack subsystem and 2 drivers
All of the movements around have acks from the various subsystem
maintainers, and all of this has been in the linux-next tree for a
while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up various trivial conflicts, along with a non-trivial one found
in -next and pointed out by Olof Johanssen: a clean - but incorrect -
merge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually
as per Stephen Rothwell.
* tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
Staging: bcm: Remove two unused variables from Adapter.h
Staging: bcm: Removes the volatile type definition from Adapter.h
Staging: bcm: Rename all "INT" to "int" in Adapter.h
Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
Staging: bcm: Correctly format all comments in Adapter.h
Staging: bcm: Fix all whitespace issues in Adapter.h
Staging: bcm: Properly format braces in Adapter.h
Staging: ipack/bridges/tpci200: remove unneeded casts
Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
Staging: ipack: remove board_name and bus_name fields from struct ipack_device
Staging: ipack: improve the register of a bus and a device in the bus.
staging: comedi: cleanup all the comedi_driver 'detach' functions
staging: comedi: remove all 'default N' in Kconfig
staging: line6/config.h: Delete unused header
staging: gdm72xx depends on NET
staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
staging: drm/omap: initial dmabuf/prime import support
staging: drm/omap: dmabuf/prime mmap support
pstore/ram: Add ECC support
pstore/ram: Switch to persistent_ram routines
...
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r-- | drivers/staging/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index eae8a21f46b..a987b3ad380 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile | |||
@@ -3,8 +3,8 @@ | |||
3 | # fix for build system bug... | 3 | # fix for build system bug... |
4 | obj-$(CONFIG_STAGING) += staging.o | 4 | obj-$(CONFIG_STAGING) += staging.o |
5 | 5 | ||
6 | obj-y += serial/ | ||
7 | obj-y += media/ | 6 | obj-y += media/ |
7 | obj-y += net/ | ||
8 | obj-$(CONFIG_ET131X) += et131x/ | 8 | obj-$(CONFIG_ET131X) += et131x/ |
9 | obj-$(CONFIG_SLICOSS) += slicoss/ | 9 | obj-$(CONFIG_SLICOSS) += slicoss/ |
10 | obj-$(CONFIG_USBIP_CORE) += usbip/ | 10 | obj-$(CONFIG_USBIP_CORE) += usbip/ |
@@ -29,6 +29,7 @@ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ | |||
29 | obj-$(CONFIG_VT6655) += vt6655/ | 29 | obj-$(CONFIG_VT6655) += vt6655/ |
30 | obj-$(CONFIG_VT6656) += vt6656/ | 30 | obj-$(CONFIG_VT6656) += vt6656/ |
31 | obj-$(CONFIG_VME_BUS) += vme/ | 31 | obj-$(CONFIG_VME_BUS) += vme/ |
32 | obj-$(CONFIG_IPACK_BUS) += ipack/ | ||
32 | obj-$(CONFIG_DX_SEP) += sep/ | 33 | obj-$(CONFIG_DX_SEP) += sep/ |
33 | obj-$(CONFIG_IIO) += iio/ | 34 | obj-$(CONFIG_IIO) += iio/ |
34 | obj-$(CONFIG_ZRAM) += zram/ | 35 | obj-$(CONFIG_ZRAM) += zram/ |
@@ -49,7 +50,6 @@ obj-$(CONFIG_FT1000) += ft1000/ | |||
49 | obj-$(CONFIG_SPEAKUP) += speakup/ | 50 | obj-$(CONFIG_SPEAKUP) += speakup/ |
50 | obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217) += cptm1217/ | 51 | obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217) += cptm1217/ |
51 | obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ | 52 | obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ |
52 | obj-$(CONFIG_INTEL_MEI) += mei/ | ||
53 | obj-$(CONFIG_MFD_NVEC) += nvec/ | 53 | obj-$(CONFIG_MFD_NVEC) += nvec/ |
54 | obj-$(CONFIG_DRM_OMAP) += omapdrm/ | 54 | obj-$(CONFIG_DRM_OMAP) += omapdrm/ |
55 | obj-$(CONFIG_ANDROID) += android/ | 55 | obj-$(CONFIG_ANDROID) += android/ |
@@ -57,3 +57,4 @@ obj-$(CONFIG_PHONE) += telephony/ | |||
57 | obj-$(CONFIG_RAMSTER) += ramster/ | 57 | obj-$(CONFIG_RAMSTER) += ramster/ |
58 | obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/ | 58 | obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/ |
59 | obj-$(CONFIG_USB_G_CCG) += ccg/ | 59 | obj-$(CONFIG_USB_G_CCG) += ccg/ |
60 | obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/ | ||