final patches to make 2.6.13 compile on m68k

svn path=/dists/trunk/linux-2.6/; revision=4524
This commit is contained in:
Christian T. Steigies 2005-10-18 20:54:35 +00:00
parent 35937e04ec
commit 4e587d6f47
5 changed files with 18 additions and 4 deletions

View File

@ -278,6 +278,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_INFINIBAND is not set
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
CONFIG_EXT2_FS_XIP=n
CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_JBD=y
@ -285,6 +286,7 @@ CONFIG_JBD=y
CONFIG_XFS_FS=m
CONFIG_XFS_EXPORT=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_QUOTA=n
# CONFIG_XFS_SECURITY is not set
# CONFIG_XFS_POSIX_ACL is not set
CONFIG_SYSFS=y

View File

@ -76,7 +76,7 @@ CONFIG_BLZ2060_SCSI=y
CONFIG_BLZ1230_SCSI=y
CONFIG_FASTLANE_SCSI=y
CONFIG_SCSI_AMIGA7XX=y
CONFIG_OKTAGON_SCSI=y
CONFIG_OKTAGON_SCSI=n
# CONFIG_SCSI_NCR53C7xx_FAST is not set
# CONFIG_CD_NO_IDESCSI is not set
# CONFIG_DM_MULTIPATH is not set

View File

@ -35,12 +35,17 @@ CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
# CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_KEYBOARD_SUNKBD is not set
CONFIG_KEYBOARD_HIL_OLD=n
CONFIG_KEYBOARD_HIL=n
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_HIL=n
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_MISC is not set
CONFIG_SERIO=m
CONFIG_SERIO_SERPORT=m
CONFIG_HP_SDC=n
CONFIG_HIL_MLC=n
CONFIG_SERIO_LIBPS2=m
# CONFIG_SERIAL_8250 is not set
CONFIG_GEN_RTC=y

6
debian/changelog vendored
View File

@ -60,9 +60,11 @@ linux-2.6 (2.6.13-2) UNRELEASED; urgency=low
[ Christian T. Steigies ]
* disable CONFIG_EXT2_FS_XIP for m68k like on all(?) other arches
* deactivate OKTAGON_SCSI for amiga/m68k until it can be compiled again
* deactivate CONFIG_KEYBOARD_HIL, CONFIG_MOUSE_HIL, and CONFIG_HIL_MLC for hp/m68k
* enable CONFIG_KEYBOARD_HIL_OLD, CONFIG_HP_SDC for hp/m68k
* deactivate CONFIG_KEYBOARD_HIL_OLD, CONFIG_KEYBOARD_HIL, CONFIG_MOUSE_HIL,
CONFIG_HIL_MLC, and CONFIG_HP_SDC for hp/m68k
* update m68k.diff for 2.6.13
* split out patches that do not intefere with other arches to
patches-debian/m68k-*
-- Simon Horman <horms@debian.org> Tue, 11 Oct 2005 19:50:55 +0900

View File

@ -3,7 +3,12 @@
+ fbdev-radeon-noaccel.patch
+ fs-asfs-2.patch
#+ ia64-irq-affinity-upfix.patch
+ m68k-42_dma.patch
#- m68k-42_dma.patch
#- m68k-sonic.patch
+ m68k-arch.patch
+ m68k-drivers.patch
+ m68k-kernel.patch
+ m68k-include-m68k.patch
+ modular-ide.patch
+ modular-ide-pnp.patch
+ powerpc-calibrate-tau.patch