diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:05:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:05:51 -0500 |
| commit | 06991c28f37ad68e5c03777f5c3b679b56e3dac1 (patch) | |
| tree | 4be75788e21c3c644fe6d39abf47693a171cf4f8 /net/mac802154 | |
| parent | 460dc1eecf37263c8e3b17685ef236f0d236facb (diff) | |
| parent | 74fef7a8fd1d2bd94f925d6638bb4c3049e7c381 (diff) | |
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman:
"Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers
all over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
Other than those patches, there's not much here, some minor fixes and
updates"
Fix up trivial conflicts
* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
base: memory: fix soft/hard_offline_page permissions
drivercore: Fix ordering between deferred_probe and exiting initcalls
backlight: fix class_find_device() arguments
TTY: mark tty_get_device call with the proper const values
driver-core: constify data for class_find_device()
firmware: Ignore abort check when no user-helper is used
firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
firmware: Make user-mode helper optional
firmware: Refactoring for splitting user-mode helper code
Driver core: treat unregistered bus_types as having no devices
watchdog: Convert to devm_ioremap_resource()
thermal: Convert to devm_ioremap_resource()
spi: Convert to devm_ioremap_resource()
power: Convert to devm_ioremap_resource()
mtd: Convert to devm_ioremap_resource()
mmc: Convert to devm_ioremap_resource()
mfd: Convert to devm_ioremap_resource()
media: Convert to devm_ioremap_resource()
iommu: Convert to devm_ioremap_resource()
drm: Convert to devm_ioremap_resource()
...
Diffstat (limited to 'net/mac802154')
| -rw-r--r-- | net/mac802154/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac802154/Kconfig b/net/mac802154/Kconfig index a967ddaa4e2f..b33dd76d4307 100644 --- a/net/mac802154/Kconfig +++ b/net/mac802154/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config MAC802154 | 1 | config MAC802154 |
| 2 | tristate "Generic IEEE 802.15.4 Soft Networking Stack (mac802154)" | 2 | tristate "Generic IEEE 802.15.4 Soft Networking Stack (mac802154)" |
| 3 | depends on IEEE802154 && EXPERIMENTAL | 3 | depends on IEEE802154 |
| 4 | select CRC_CCITT | 4 | select CRC_CCITT |
| 5 | ---help--- | 5 | ---help--- |
| 6 | This option enables the hardware independent IEEE 802.15.4 | 6 | This option enables the hardware independent IEEE 802.15.4 |