* debian/config/powerpc/config: Reorder macintosh device options.

* debian/config/powerpc/config.powerpc, debian/config/powerpc/config.powerpc64:
  Remove duplicate options.

svn path=/dists/trunk/linux-2.6/; revision=9421
This commit is contained in:
Bastian Blank 2007-08-30 18:55:39 +00:00
parent 6dc2d9fe19
commit d791fdc77b
3 changed files with 25 additions and 16 deletions

View File

@ -1,3 +1,28 @@
#
# Macintosh device drivers
#
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_ADB=y
CONFIG_ADB_CUDA=y
CONFIG_ADB_PMU=y
CONFIG_ADB_PMU_LED=y
# CONFIG_ADB_PMU_LED_IDE is not set
CONFIG_PMAC_SMU=y
# CONFIG_PMAC_APM_EMU is not set
CONFIG_PMAC_MEDIABAY=y
CONFIG_ADB_MACIO=y
CONFIG_INPUT_ADBHID=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_THERM_WINDTUNNEL=m
CONFIG_THERM_ADT746X=m
CONFIG_THERM_PM72=m
CONFIG_WINDFARM=m
CONFIG_WINDFARM_PM81=m
CONFIG_WINDFARM_PM91=m
CONFIG_WINDFARM_PM112=m
CONFIG_ANSLCD=m
CONFIG_PMAC_RACKMETER=m
CONFIG_GENERIC_HARDIRQS=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_PPC=y
@ -186,18 +211,6 @@ CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
CONFIG_ADB=y
CONFIG_ADB_CUDA=y
# CONFIG_ADB_PMU is not set
# CONFIG_PMAC_APM_EMU is not set
CONFIG_PMAC_BACKLIGHT=y
CONFIG_PMAC_BACKLIGHT_LEGACY=y
CONFIG_ADB_MACIO=y
CONFIG_INPUT_ADBHID=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_THERM_WINDTUNNEL=m
CONFIG_THERM_ADT746X=m
CONFIG_ANSLCD=m
CONFIG_ATM=m
CONFIG_ATM_CLIP=m
CONFIG_ATM_CLIP_NO_ICMP=y

View File

@ -3,7 +3,6 @@ CONFIG_PPC32=y
# CONFIG_SMP is not set
CONFIG_PM_STD_PARTITION=""
# CONFIG_IRPORT_SIR is not set
CONFIG_ADB_PMU_LED=y
CONFIG_PCMCIA_XIRTULIP=m
CONFIG_MAC_FLOPPY=y
CONFIG_FLATMEM_MANUAL=y

View File

@ -38,8 +38,6 @@ CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_SPARSEMEM_EXTREME=y
# CONFIG_MEMORY_HOTPLUG is not set
CONFIG_NUMA=y
# CONFIG_PMAC_BACKLIGHT is not set
CONFIG_PMAC_SMU=y
# CONFIG_POWER4_ONLY is not set
# CONFIG_PPC_ISERIES is not set
CONFIG_PPC_MAPLE=y
@ -59,7 +57,6 @@ CONFIG_SCSI_IBMVSCSIS=m
CONFIG_SMP=y
CONFIG_STOP_MACHINE=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_THERM_PM72=m
CONFIG_U3_DART=y
CONFIG_WATCHDOG_RTAS=m
CONFIG_ARCH_SELECT_MEMORY_MODEL=y