revert r13436 since btrfs/parisc compilation issue is now resolved
svn path=/dists/sid/linux-2.6/; revision=13463
This commit is contained in:
parent
2b28128afe
commit
ada24e7925
|
@ -2,7 +2,6 @@ linux-2.6 (2.6.29-4) UNRELEASED; urgency=low
|
|||
|
||||
[ maximilian attems ]
|
||||
* drm/i915: allow tiled front buffers on 965+.
|
||||
* [parisc] Disable BTRFS.
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
* Extend erase timeout in M25P80 SPI Flash driver (Peter Horton).
|
||||
|
|
|
@ -628,11 +628,6 @@ CONFIG_LOGO_PARISC_CLUT224=y
|
|||
##
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
##
|
||||
## file: fs/btrfs/Kconfig
|
||||
##
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
|
||||
##
|
||||
## file: fs/cramfs/Kconfig
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue